- SunOS 4.x support from Todd C. Miller <Todd.Miller@courtesan.com>

1 files changed, 19 insertions, 1 deletions

diff --git a/auth-passwd.c b/auth-passwd.c
index e64e65682..b27c5bae8 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -11,7 +11,7 @@
 
 #ifndef USE_PAM
 
-RCSID("$Id: auth-passwd.c,v 1.19 2000/04/29 14:47:29 damien Exp $");
+RCSID("$Id: auth-passwd.c,v 1.20 2000/05/20 05:03:00 damien Exp $");
 
 #include "packet.h"
 #include "ssh.h"
@@ -28,6 +28,11 @@ RCSID("$Id: auth-passwd.c,v 1.19 2000/04/29 14:47:29 damien Exp $");
 #ifdef HAVE_SHADOW_H
 # include <shadow.h>
 #endif
+#ifdef HAVE_GETPWANAM
+# include <sys/label.h>
+# include <sys/audit.h>
+# include <pwdadj.h>
+#endif
 #if defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT)
 # include "md5crypt.h"
 #endif /* defined(HAVE_MD5_PASSWORDS) && !defined(HAVE_MD5_CRYPT) */
@@ -46,6 +51,9 @@ auth_password(struct passwd * pw, const char *password)
 #ifdef HAVE_SHADOW_H
         struct spwd *spw;
 #endif
+#ifdef HAVE_GETPWANAM
+        struct passwd_adjunct *spw;
+#endif
 #ifdef WITH_AIXAUTHENTICATE
         char *authmsg;
         char *loginmsg;
@@ -99,6 +107,16 @@ auth_password(struct passwd * pw, const char *password)
                 pw_password = spw->sp_pwdp;
         }
 #endif /* defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) */
+#if defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW)
+        if (issecure() && (spw = getpwanam(pw->pw_name)) != NULL)
+        {
+                /* Check for users with no password. */
+                if (strcmp(password, "") == 0 && strcmp(spw->pwa_passwd, "") == 0)
+                        return 1;
+
+                pw_password = spw->pwa_passwd;
+        }
+#endif /* defined(HAVE_GETPWANAM) && !defined(DISABLE_SHADOW) */
 
         if (pw_password[0] != '\0')
                 salt = pw_password;