- markus@cvs.openbsd.org 2002/03/25 09:21:13

     [auth-rsa.c]
     return 0 (not NULL); tomh@po.crl.go.jp

diff --git a/ChangeLog b/ChangeLog
index e8279ae18d9cc3110e8f26ddc9de22075d68a63f..7e8b9660238bb933a715b2f1058e7c039a71dfa0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,9 @@
    - stevesk@cvs.openbsd.org 2002/03/24 23:20:00
      [monitor.c]
      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
  - (stevesk) [session.c] disable LOGIN_NEEDS_TERM until we are sure
@@ -8036,4 +8039,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - 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 $

diff --git a/auth-rsa.c b/auth-rsa.c
index 9c5d484b19ebddd8ed744d9e0398ffa8653959d2..c51400c2a93b41323e72950b7beb623405c5eaa2 100644 (file)
--- a/auth-rsa.c
+++ b/auth-rsa.c
@@ -14,7 +14,7 @@
  */
 
 #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/md5.h>
@@ -165,7 +165,7 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey)
                /* Restore the privileged uid. */
                restore_uid();
                xfree(file);
-               return (NULL);
+               return (0);
        }
        /* Open the file containing the authorized keys. */
        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_uid();
                xfree(file);
-               return (NULL);
+               return (0);
        }
        if (options.strict_modes &&
            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);
                log("Authentication refused: %s", line);
                restore_uid();
-               return (NULL);
+               return (0);
        }
 
        /* Flag indicating whether the key is allowed. */