- markus@cvs.openbsd.org 2002/03/25 09:21:13
[auth-rsa.c] return 0 (not NULL); tomh@po.crl.go.jp
This commit is contained in:
parent
2e9d866608
commit
f6d367b91a
|
@ -22,6 +22,9 @@
|
||||||
- stevesk@cvs.openbsd.org 2002/03/24 23:20:00
|
- stevesk@cvs.openbsd.org 2002/03/24 23:20:00
|
||||||
[monitor.c]
|
[monitor.c]
|
||||||
remove "\n" from fatal()
|
remove "\n" from fatal()
|
||||||
|
- markus@cvs.openbsd.org 2002/03/25 09:21:13
|
||||||
|
[auth-rsa.c]
|
||||||
|
return 0 (not NULL); tomh@po.crl.go.jp
|
||||||
|
|
||||||
20020324
|
20020324
|
||||||
- (stevesk) [session.c] disable LOGIN_NEEDS_TERM until we are sure
|
- (stevesk) [session.c] disable LOGIN_NEEDS_TERM until we are sure
|
||||||
|
@ -8036,4 +8039,4 @@
|
||||||
- Wrote replacements for strlcpy and mkdtemp
|
- Wrote replacements for strlcpy and mkdtemp
|
||||||
- Released 1.0pre1
|
- Released 1.0pre1
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.1984 2002/03/26 02:49:34 mouring Exp $
|
$Id: ChangeLog,v 1.1985 2002/03/26 02:59:31 mouring Exp $
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: auth-rsa.c,v 1.52 2002/03/18 17:50:31 provos Exp $");
|
RCSID("$OpenBSD: auth-rsa.c,v 1.53 2002/03/25 09:21:13 markus Exp $");
|
||||||
|
|
||||||
#include <openssl/rsa.h>
|
#include <openssl/rsa.h>
|
||||||
#include <openssl/md5.h>
|
#include <openssl/md5.h>
|
||||||
|
@ -165,7 +165,7 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey)
|
||||||
/* Restore the privileged uid. */
|
/* Restore the privileged uid. */
|
||||||
restore_uid();
|
restore_uid();
|
||||||
xfree(file);
|
xfree(file);
|
||||||
return (NULL);
|
return (0);
|
||||||
}
|
}
|
||||||
/* Open the file containing the authorized keys. */
|
/* Open the file containing the authorized keys. */
|
||||||
f = fopen(file, "r");
|
f = fopen(file, "r");
|
||||||
|
@ -173,7 +173,7 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey)
|
||||||
/* Restore the privileged uid. */
|
/* Restore the privileged uid. */
|
||||||
restore_uid();
|
restore_uid();
|
||||||
xfree(file);
|
xfree(file);
|
||||||
return (NULL);
|
return (0);
|
||||||
}
|
}
|
||||||
if (options.strict_modes &&
|
if (options.strict_modes &&
|
||||||
secure_filename(f, file, pw, line, sizeof(line)) != 0) {
|
secure_filename(f, file, pw, line, sizeof(line)) != 0) {
|
||||||
|
@ -181,7 +181,7 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey)
|
||||||
fclose(f);
|
fclose(f);
|
||||||
log("Authentication refused: %s", line);
|
log("Authentication refused: %s", line);
|
||||||
restore_uid();
|
restore_uid();
|
||||||
return (NULL);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Flag indicating whether the key is allowed. */
|
/* Flag indicating whether the key is allowed. */
|
||||||
|
|
Loading…
Reference in New Issue