From 1bc3bdb1c2d378687ab356b9f860262e8955e058 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Thu, 20 Sep 2001 23:11:26 +0000 Subject: - markus@cvs.openbsd.org 2001/09/20 13:46:48 [auth2.c] key_read returns now -1 or 1 --- ChangeLog | 5 ++++- auth2.c | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5fae66f36..1c93c101a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ - stevesk@cvs.openbsd.org 2001/09/20 00:15:54 [sshd.8] fix ClientAliveCountMax + - markus@cvs.openbsd.org 2001/09/20 13:46:48 + [auth2.c] + key_read returns now -1 or 1 20010919 - (bal) OpenBSD Sync @@ -6538,4 +6541,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1551 2001/09/20 23:09:16 mouring Exp $ +$Id: ChangeLog,v 1.1552 2001/09/20 23:11:26 mouring Exp $ diff --git a/auth2.c b/auth2.c index a52c9e289..39322dc69 100644 --- a/auth2.c +++ b/auth2.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth2.c,v 1.69 2001/07/23 18:14:58 stevesk Exp $"); +RCSID("$OpenBSD: auth2.c,v 1.70 2001/09/20 13:46:48 markus Exp $"); #include @@ -698,7 +698,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file) if (!*cp || *cp == '\n' || *cp == '#') continue; - if (key_read(found, &cp) == -1) { + if (key_read(found, &cp) != 1) { /* no key? check if there are options for this key */ int quoted = 0; debug2("user_key_allowed: check options: '%s'", cp); @@ -712,7 +712,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file) /* Skip remaining whitespace. */ for (; *cp == ' ' || *cp == '\t'; cp++) ; - if (key_read(found, &cp) == -1) { + if (key_read(found, &cp) != 1) { debug2("user_key_allowed: advance: '%s'", cp); /* still no key? advance to next line*/ continue; -- cgit v1.2.3