RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-28 04:52:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/09/20 13:46:48

Browse Source 
[auth2.c]
     key_read returns now -1 or 1
This commit is contained in:
Ben Lindstrom 2001-09-20 23:11:26 +00:00
parent 406b4f0f33
commit 1bc3bdb1c2
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -5,6 +5,9 @@
- stevesk@cvs.openbsd.org 2001/09/20 00:15:54 - stevesk@cvs.openbsd.org 2001/09/20 00:15:54
[sshd.8] [sshd.8]
fix ClientAliveCountMax fix ClientAliveCountMax
- markus@cvs.openbsd.org 2001/09/20 13:46:48
[auth2.c]
key_read returns now -1 or 1
20010919 20010919
- (bal) OpenBSD Sync - (bal) OpenBSD Sync
@ -6538,4 +6541,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - 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 $

6
auth2.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #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 <openssl/evp.h> #include <openssl/evp.h>
@ -698,7 +698,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file)
if (!*cp || *cp == '\n' || *cp == '#') if (!*cp || *cp == '\n' || *cp == '#')
continue; continue;
if (key_read(found, &cp) == -1) { if (key_read(found, &cp) != 1) {
/* no key? check if there are options for this key */ /* no key? check if there are options for this key */
int quoted = 0; int quoted = 0;
debug2("user_key_allowed: check options: '%s'", cp); 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. */ /* Skip remaining whitespace. */
for (; *cp == ' ' || *cp == '\t'; cp++) for (; *cp == ' ' || *cp == '\t'; cp++)
; ;
if (key_read(found, &cp) == -1) { if (key_read(found, &cp) != 1) {
debug2("user_key_allowed: advance: '%s'", cp); debug2("user_key_allowed: advance: '%s'", cp);
/* still no key? advance to next line*/ /* still no key? advance to next line*/
continue; continue;