- (dtucker) [auth-shadow.c auth.c auth.h] Move shadow account expiry test

   to auth-shadow.c, no functional change.  ok djm@

diff --git a/ChangeLog b/ChangeLog
index 3d47cc609f2a91e865063f5854a76a2b86b42215..ee1320b542ce052f9d5a0216ff96ab2b37441301 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20040222
+ - (dtucker) [auth-shadow.c auth.c auth.h] Move shadow account expiry test
+   to auth-shadow.c, no functional change.  ok djm@
+
 20040220
  - (djm) [openbsd-compat/setproctitle.c] fix comments; from grange@
 

diff --git a/auth-shadow.c b/auth-shadow.c
index 4b3a514f52d638234489efda2bd718d2f788fa7d..bbb29644ca8e99ef89f9562a064764ad630fb8fc 100644 (file)
--- a/auth-shadow.c
+++ b/auth-shadow.c
@@ -36,6 +36,32 @@ RCSID("$Id$");
 
 extern Buffer loginmsg;
 
+/*
+ * For the account and password expiration functions, we assume the expiry
+ * occurs the day after the day specified.
+ */
+
+/*
+ * Check if specified account is expired.  Returns 1 if account is expired,
+ * 0 otherwise.
+ */
+int
+auth_shadow_acctexpired(struct spwd *spw)
+{
+       time_t today;
+
+       today = time(NULL) / DAY;
+       debug3("%s: today %d sp_expire %d", __func__, (int)today,
+           (int)spw->sp_expire);
+
+       if (spw->sp_expire != -1 && today > spw->sp_expire) {
+               logit("Account %.100s has expired", spw->sp_namp);
+               return 1;
+       }
+
+       return 0;
+}
+
 /*
  * Checks password expiry for platforms that use shadow passwd files.
  * Returns: 1 = password expired, 0 = password not expired

diff --git a/auth.c b/auth.c
index c6e7c21c41d55bd4fb6c8384b1006ac1ff932447..6d999221c12d4e5c6095d73d558bcc34d0349bee 100644 (file)
--- a/auth.c
+++ b/auth.c
@@ -28,9 +28,9 @@ RCSID("$OpenBSD: auth.c,v 1.51 2003/11/21 11:57:02 djm Exp $");
 #ifdef HAVE_LOGIN_H
 #include <login.h>
 #endif
-#if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW)
+#ifdef USE_SHADOW
 #include <shadow.h>
-#endif /* defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) */
+#endif
 
 #ifdef HAVE_LIBGEN_H
 #include <libgen.h>
@@ -76,7 +76,7 @@ allowed_user(struct passwd * pw)
        const char *hostname = NULL, *ipaddr = NULL, *passwd = NULL;
        char *shell;
        int i;
-#if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW)
+#ifdef USE_SHADOW
        struct spwd *spw = NULL;
 #endif
 
@@ -84,34 +84,17 @@ allowed_user(struct passwd * pw)
        if (!pw || !pw->pw_name)
                return 0;
 
-#if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW)
+#ifdef USE_SHADOW
        if (!options.use_pam)
                spw = getspnam(pw->pw_name);
 #ifdef HAS_SHADOW_EXPIRE
-#define        DAY             (24L * 60 * 60) /* 1 day in seconds */
-       if (!options.use_pam && spw != NULL) {
-               int disabled = 0;
-               time_t today;
-
-               today = time(NULL) / DAY;
-               debug3("allowed_user: today %d sp_expire %d sp_lstchg %d"
-                   " sp_max %d", (int)today, (int)spw->sp_expire,
-                   (int)spw->sp_lstchg, (int)spw->sp_max);
-
-               /*
-                * We assume account and password expiration occurs the
-                * day after the day specified.
-                */
-               if (spw->sp_expire != -1 && today > spw->sp_expire) {
-                       logit("Account %.100s has expired", pw->pw_name);
-                       return 0;
-               }
-       }
+       if (!options.use_pam && spw != NULL && auth_shadow_acctexpired(spw))
+               return 0;
 #endif /* HAS_SHADOW_EXPIRE */
-#endif /* defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) */
+#endif /* USE_SHADOW */
 
        /* grab passwd field for locked account check */
-#if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW)
+#ifdef USE_SHADOW
        if (spw != NULL)
                passwd = spw->sp_pwdp;
 #else

diff --git a/auth.h b/auth.h
index b6a6a49a5d84393ba0799c093a56daf8874dfc74..a8f61f4030812ff963ec1020493c9c70ca40159e 100644 (file)
--- a/auth.h
+++ b/auth.h
@@ -122,7 +122,8 @@ int auth_krb5_password(Authctxt *authctxt, const char *password);
 void   krb5_cleanup_proc(Authctxt *authctxt);
 #endif /* KRB5 */
 
-#ifdef USE_SHADOW
+#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
+int auth_shadow_acctexpired(struct spwd *);
 int auth_shadow_pwexpired(Authctxt *);
 #endif