Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it

extensively yet.

ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.

1 files changed, 67 insertions, 74 deletions

diff --git a/auth-passwd.c b/auth-passwd.c
index 971c7ba19..b9679abd0 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -36,19 +36,24 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth-passwd.c,v 1.29 2003/08/26 09:58:43 markus Exp $");
+RCSID("$OpenBSD: auth-passwd.c,v 1.31 2004/01/30 09:48:57 markus Exp $");
 
 #include "packet.h"
 #include "log.h"
 #include "servconf.h"
 #include "auth.h"
-#ifdef WITH_AIXAUTHENTICATE
-# include "buffer.h"
-# include "canohost.h"
-extern Buffer loginmsg;
-#endif
+#include "auth-options.h"
 
 extern ServerOptions options;
+int sys_auth_passwd(Authctxt *, const char *);
+
+void
+disable_forwarding(void)
+{
+        no_port_forwarding_flag = 1;
+        no_agent_forwarding_flag = 1;
+        no_x11_forwarding_flag = 1;
+}
 
 /*
  * Tries to authenticate the user using password.  Returns true if
@@ -59,29 +64,31 @@ auth_password(Authctxt *authctxt, const char *password)
 {
         struct passwd * pw = authctxt->pw;
         int ok = authctxt->valid;
+        static int expire_checked = 0;
 
-        /* deny if no user. */
-        if (pw == NULL)
-                return 0;
 #ifndef HAVE_CYGWIN
-        if (pw && pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES)
+        if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES)
                 ok = 0;
 #endif
         if (*password == '\0' && options.permit_empty_passwd == 0)
                 return 0;
 
 #if defined(HAVE_OSF_SIA)
+        /*
+         * XXX: any reason this is before krb?  could be moved to
+         * sys_auth_passwd()?  -dt
+         */
         return auth_sia_password(authctxt, password) && ok;
-#else
-# ifdef KRB5
+#endif
+#ifdef KRB5
         if (options.kerberos_authentication == 1) {
                 int ret = auth_krb5_password(authctxt, password);
                 if (ret == 1 || ret == 0)
                         return ret && ok;
                 /* Fall back to ordinary passwd authentication. */
         }
-# endif
-# ifdef HAVE_CYGWIN
+#endif
+#ifdef HAVE_CYGWIN
         if (is_winnt) {
                 HANDLE hToken = cygwin_logon_user(pw, password);
 
@@ -90,74 +97,60 @@ auth_password(Authctxt *authctxt, const char *password)
                 cygwin_set_impersonation_token(hToken);
                 return ok;
         }
-# endif
-# ifdef WITH_AIXAUTHENTICATE
-        {
-                char *authmsg = NULL;
-                int reenter = 1;
-                int authsuccess = 0;
-
-                if (authenticate(pw->pw_name, password, &reenter,
-                    &authmsg) == 0 && ok) {
-                        char *msg;
-                        char *host = 
-                            (char *)get_canonical_hostname(options.use_dns);
-
-                        authsuccess = 1;
-                        aix_remove_embedded_newlines(authmsg);  
-
-                        debug3("AIX/authenticate succeeded for user %s: %.100s",
-                                pw->pw_name, authmsg);
-
-                        /* No pty yet, so just label the line as "ssh" */
-                        aix_setauthdb(authctxt->user);
-                        if (loginsuccess(authctxt->user, host, "ssh", 
-                            &msg) == 0) {
-                                if (msg != NULL) {
-                                        debug("%s: msg %s", __func__, msg);
-                                        buffer_append(&loginmsg, msg, 
-                                            strlen(msg));
-                                        xfree(msg);
-                                }
-                        }
-                } else {
-                        debug3("AIX/authenticate failed for user %s: %.100s",
-                            pw->pw_name, authmsg);
+#endif
+#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
+        if (!expire_checked) {
+                expire_checked = 1;
+                if (auth_shadow_pwexpired(authctxt)) {
+                        disable_forwarding();
+                        authctxt->force_pwchange = 1;
                 }
+        }
+#endif
+                
+        return (sys_auth_passwd(authctxt, password) && ok);
+}
 
-                if (authmsg != NULL)
-                        xfree(authmsg);
-
-                return authsuccess;
+#ifdef BSD_AUTH
+int
+sys_auth_passwd(Authctxt *authctxt, const char *password)
+{
+        struct passwd *pw = authctxt->pw;
+        auth_session_t *as;
+
+        as = auth_usercheck(pw->pw_name, authctxt->style, "auth-ssh",
+            (char *)password);
+        if (auth_getstate(as) & AUTH_PWEXPIRED) {
+                auth_close(as);
+                disable_forwarding();
+                authctxt->force_pwchange = 1;
+                return (1);
+        } else {
+                return (auth_close(as));
         }
-# endif
-# ifdef BSD_AUTH
-        if (auth_userokay(pw->pw_name, authctxt->style, "auth-ssh",
-            (char *)password) == 0)
-                return 0;
-        else
-                return ok;
-# else
-        {
+}
+#elif !defined(CUSTOM_SYS_AUTH_PASSWD)
+int
+sys_auth_passwd(Authctxt *authctxt, const char *password)
+{
+        struct passwd *pw = authctxt->pw;
+        char *encrypted_password;
+
         /* Just use the supplied fake password if authctxt is invalid */
         char *pw_password = authctxt->valid ? shadow_pw(pw) : pw->pw_passwd;
 
         /* Check for users with no password. */
         if (strcmp(pw_password, "") == 0 && strcmp(password, "") == 0)
-                return ok;
-        else {
-                /* Encrypt the candidate password using the proper salt. */
-                char *encrypted_password = xcrypt(password,
-                    (pw_password[0] && pw_password[1]) ? pw_password : "xx");
+                return (1);
 
-                /*
-                 * Authentication is accepted if the encrypted passwords
-                 * are identical.
-                 */
-                return (strcmp(encrypted_password, pw_password) == 0) && ok;
-        }
+        /* Encrypt the candidate password using the proper salt. */
+        encrypted_password = xcrypt(password,
+            (pw_password[0] && pw_password[1]) ? pw_password : "xx");
 
-        }
-# endif
-#endif /* !HAVE_OSF_SIA */
+        /*
+         * Authentication is accepted if the encrypted passwords
+         * are identical.
+         */
+        return (strcmp(encrypted_password, pw_password) == 0);
 }
+#endif