=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth2.c,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -u -r1.8.2.3 -r1.8.2.4 --- src/usr.bin/ssh/auth2.c 2001/03/12 15:44:08 1.8.2.3 +++ src/usr.bin/ssh/auth2.c 2001/03/21 18:52:35 1.8.2.4 @@ -23,14 +23,14 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth2.c,v 1.8.2.3 2001/03/12 15:44:08 jason Exp $"); +RCSID("$OpenBSD: auth2.c,v 1.8.2.4 2001/03/21 18:52:35 jason Exp $"); #include #include "ssh2.h" #include "xmalloc.h" #include "rsa.h" -#include "pty.h" +#include "sshpty.h" #include "packet.h" #include "buffer.h" #include "log.h" @@ -47,6 +47,7 @@ #include "pathnames.h" #include "uidswap.h" #include "auth-options.h" +#include "misc.h" /* import */ extern ServerOptions options; @@ -71,7 +72,6 @@ /* helper */ Authmethod *authmethod_lookup(const char *name); -struct passwd *pwcopy(struct passwd *pw); int user_key_allowed(struct passwd *pw, Key *key); char *authmethods_get(void); @@ -576,7 +576,7 @@ } if (fail) { fclose(f); - log("%s",buf); + log("%s", buf); restore_uid(); return 0; } @@ -624,5 +624,7 @@ restore_uid(); fclose(f); key_free(found); + if (!found_key) + debug2("key not found"); return found_key; }