diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-09-20 23:11:26 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-09-20 23:11:26 +0000 |
commit | 1bc3bdb1c2d378687ab356b9f860262e8955e058 (patch) | |
tree | 7b543c6dcfd23883e9f1429c81bfc8a8482cbffa /auth2.c | |
parent | 406b4f0f33c5a0e81a0e32cf7494c209cbfe60ce (diff) |
- markus@cvs.openbsd.org 2001/09/20 13:46:48
[auth2.c]
key_read returns now -1 or 1
Diffstat (limited to 'auth2.c')
-rw-r--r-- | auth2.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2.c,v 1.69 2001/07/23 18:14:58 stevesk Exp $"); | 26 | RCSID("$OpenBSD: auth2.c,v 1.70 2001/09/20 13:46:48 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/evp.h> | 28 | #include <openssl/evp.h> |
29 | 29 | ||
@@ -698,7 +698,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file) | |||
698 | if (!*cp || *cp == '\n' || *cp == '#') | 698 | if (!*cp || *cp == '\n' || *cp == '#') |
699 | continue; | 699 | continue; |
700 | 700 | ||
701 | if (key_read(found, &cp) == -1) { | 701 | if (key_read(found, &cp) != 1) { |
702 | /* no key? check if there are options for this key */ | 702 | /* no key? check if there are options for this key */ |
703 | int quoted = 0; | 703 | int quoted = 0; |
704 | debug2("user_key_allowed: check options: '%s'", cp); | 704 | debug2("user_key_allowed: check options: '%s'", cp); |
@@ -712,7 +712,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file) | |||
712 | /* Skip remaining whitespace. */ | 712 | /* Skip remaining whitespace. */ |
713 | for (; *cp == ' ' || *cp == '\t'; cp++) | 713 | for (; *cp == ' ' || *cp == '\t'; cp++) |
714 | ; | 714 | ; |
715 | if (key_read(found, &cp) == -1) { | 715 | if (key_read(found, &cp) != 1) { |
716 | debug2("user_key_allowed: advance: '%s'", cp); | 716 | debug2("user_key_allowed: advance: '%s'", cp); |
717 | /* still no key? advance to next line*/ | 717 | /* still no key? advance to next line*/ |
718 | continue; | 718 | continue; |