- (djm) Bug #573 - Remove unneeded Krb headers and compat goop. Patch from

[openssh.git] / auth.c

diff --git a/auth.c b/auth.c
index ba26034d5f023a828d78b90de260e0d834e6d097..6b48addf71f77e98e00adbabebb6c69fd5806d22 100644 (file)
--- a/auth.c
+++ b/auth.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth.c,v 1.46 2002/11/04 10:07:53 markus Exp $");
+RCSID("$OpenBSD: auth.c,v 1.48 2003/06/02 09:17:34 markus Exp $");
 
 #ifdef HAVE_LOGIN_H
 #include <login.h>
@@ -78,8 +78,8 @@ allowed_user(struct passwd * pw)
 #ifdef WITH_AIXAUTHENTICATE
        char *loginmsg;
 #endif /* WITH_AIXAUTHENTICATE */
-#if !defined(USE_PAM) && defined(HAVE_SHADOW_H) && \
-    !defined(DISABLE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
+#if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) && \
+    defined(HAS_SHADOW_EXPIRE)
        struct spwd *spw;
        time_t today;
 #endif
@@ -88,10 +88,10 @@ allowed_user(struct passwd * pw)
        if (!pw || !pw->pw_name)
                return 0;
 
-#if !defined(USE_PAM) && defined(HAVE_SHADOW_H) && \
-    !defined(DISABLE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
+#if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) && \
+    defined(HAS_SHADOW_EXPIRE)
 #define        DAY             (24L * 60 * 60) /* 1 day in seconds */
-       if ((spw = getspnam(pw->pw_name)) != NULL) {
+       if (!options.use_pam && (spw = getspnam(pw->pw_name)) != NULL) {
                today = time(NULL) / DAY;
                debug3("allowed_user: today %d sp_expire %d sp_lstchg %d"
                    " sp_max %d", (int)today, (int)spw->sp_expire,
@@ -141,7 +141,7 @@ allowed_user(struct passwd * pw)
        }
 
        if (options.num_deny_users > 0 || options.num_allow_users > 0) {
-               hostname = get_canonical_hostname(options.verify_reverse_mapping);
+               hostname = get_canonical_hostname(options.use_dns);
                ipaddr = get_remote_ipaddr();
        }
 
@@ -268,13 +268,10 @@ auth_log(Authctxt *authctxt, int authenticated, char *method, char *info)
            get_remote_port(),
            info);
 
-#ifdef WITH_AIXAUTHENTICATE
+#ifdef CUSTOM_FAILED_LOGIN
        if (authenticated == 0 && strcmp(method, "password") == 0)
-           loginfailed(authctxt->user,
-               get_canonical_hostname(options.verify_reverse_mapping),
-               "ssh");
-#endif /* WITH_AIXAUTHENTICATE */
-
+               record_failed_login(authctxt->user, "ssh");
+#endif
 }
 
 /*
@@ -496,10 +493,8 @@ getpwnamallow(const char *user)
        if (pw == NULL) {
                logit("Illegal user %.100s from %.100s",
                    user, get_remote_ipaddr());
-#ifdef WITH_AIXAUTHENTICATE
-               loginfailed(user,
-                   get_canonical_hostname(options.verify_reverse_mapping),
-                   "ssh");
+#ifdef CUSTOM_FAILED_LOGIN
+               record_failed_login(user, "ssh");
 #endif
                return (NULL);
        }