diff --git a/ChangeLog b/ChangeLog index 311236139..3bf840f77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +20010312 + - OpenBSD CVS Sync + - markus@cvs.openbsd.org 2001/03/11 13:25:36 + [auth2.c key.c] + debug + 20010311 - OpenBSD CVS Sync - markus@cvs.openbsd.org 2001/03/10 12:48:27 @@ -4490,4 +4496,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.939 2001/03/11 01:49:19 mouring Exp $ +$Id: ChangeLog,v 1.940 2001/03/11 20:01:55 mouring Exp $ diff --git a/auth2.c b/auth2.c index aa56fa631..8d229955c 100644 --- a/auth2.c +++ b/auth2.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth2.c,v 1.45 2001/03/04 01:46:29 djm Exp $"); +RCSID("$OpenBSD: auth2.c,v 1.46 2001/03/11 13:25:36 markus Exp $"); #include @@ -688,5 +688,7 @@ user_key_allowed(struct passwd *pw, Key *key) restore_uid(); fclose(f); key_free(found); + if (!found_key) + debug2("key not found"); return found_key; } diff --git a/key.c b/key.c index 27910ff0e..df6bb2679 100644 --- a/key.c +++ b/key.c @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -RCSID("$OpenBSD: key.c,v 1.17 2001/02/04 15:32:24 stevesk Exp $"); +RCSID("$OpenBSD: key.c,v 1.18 2001/03/11 13:25:36 markus Exp $"); #include @@ -530,7 +530,7 @@ key_type_from_name(char *name) } else if (strcmp(name, "ssh-dss") == 0){ return KEY_DSA; } - debug("key_type_from_name: unknown key type '%s'", name); + debug2("key_type_from_name: unknown key type '%s'", name); return KEY_UNSPEC; }