- (dtucker) [auth-shadow.c auth.h] Provide warnings of impending account or

   password expiry.  ok djm@

diff --git a/auth-shadow.c b/auth-shadow.c
index bbb29644ca8e99ef89f9562a064764ad630fb8fc..66e8401f7c81ae507c944d4818c9c6ec99a3e51e 100644 (file)
--- a/auth-shadow.c
+++ b/auth-shadow.c
@@ -49,14 +49,25 @@ int
 auth_shadow_acctexpired(struct spwd *spw)
 {
        time_t today;
+       int daysleft;
+       char buf[256];
 
        today = time(NULL) / DAY;
-       debug3("%s: today %d sp_expire %d", __func__, (int)today,
-           (int)spw->sp_expire);
+       daysleft = spw->sp_expire - today;
+       debug3("%s: today %d sp_expire %d days left %d", __func__, (int)today,
+           (int)spw->sp_expire, daysleft);
 
-       if (spw->sp_expire != -1 && today > spw->sp_expire) {
+       if (spw->sp_expire == -1) {
+               debug3("account expiration disabled");
+       } else if (daysleft < 0) {
                logit("Account %.100s has expired", spw->sp_namp);
                return 1;
+       } else if (daysleft <= spw->sp_warn) {
+               debug3("account will expire in %d days", daysleft);
+               snprintf(buf, sizeof(buf),
+                   "Your account will expire in %d day%s.\n", daysleft,
+                   daysleft == 1 ? "" : "s");
+               buffer_append(&loginmsg, buf, strlen(buf));
        }
 
        return 0;
@@ -71,9 +82,11 @@ auth_shadow_pwexpired(Authctxt *ctxt)
 {
        struct spwd *spw = NULL;
        const char *user = ctxt->pw->pw_name;
+       char buf[256];
        time_t today;
+       int daysleft, disabled = 0;
 
-       if ((spw = getspnam(user)) == NULL) {
+       if ((spw = getspnam((char *)user)) == NULL) {
                error("Could not get shadow information for %.100s", user);
                return 0;
        }
@@ -83,21 +96,38 @@ auth_shadow_pwexpired(Authctxt *ctxt)
            (int)spw->sp_lstchg, (int)spw->sp_max);
 
 #if defined(__hpux) && !defined(HAVE_SECUREWARE)
-       if (iscomsec() && spw->sp_min == 0 && spw->sp_max == 0 &&
-           spw->sp_warn == 0)
-               return 0;       /* HP-UX Trusted Mode: expiry disabled */
+       if (iscomsec()) {
+               struct pr_passwd *pr;
+                      
+               pr = getprpwnam((char *)user);
+
+               /* Test for Trusted Mode expiry disabled */
+               if (pr != NULL && pr->ufld.fd_min == 0 &&
+                   pr->ufld.fd_lifetime == 0 && pr->ufld.fd_expire == 0 &&
+                   pr->ufld.fd_pw_expire_warning == 0 &&
+                   pr->ufld.fd_schange != 0)
+                       disabled = 1;
+       }
 #endif
 
-       /* TODO: Add code to put expiry warnings into loginmsg */
-
-       if (spw->sp_lstchg == 0) {
+       /* TODO: check sp_inact */
+       daysleft = spw->sp_lstchg + spw->sp_max - today;
+       if (disabled) {
+               debug3("password expiration disabled");
+       } else if (spw->sp_lstchg == 0) {
                logit("User %.100s password has expired (root forced)", user);
                return 1;
-       }
-
-       if (spw->sp_max != -1 && today > spw->sp_lstchg + spw->sp_max) {
+       } else if (spw->sp_max == -1) {
+               debug3("password expiration disabled");
+       } else if (daysleft < 0) {
                logit("User %.100s password has expired (password aged)", user);
                return 1;
+       } else if (daysleft <= spw->sp_warn) {
+               debug3("password will expire in %d days", daysleft);
+               snprintf(buf, sizeof(buf),
+                   "Your password will expire in %d day%s.\n", daysleft,
+                   daysleft == 1 ? "" : "s");
+               buffer_append(&loginmsg, buf, strlen(buf));
        }
 
        return 0;

diff --git a/auth.h b/auth.h
index a8f61f4030812ff963ec1020493c9c70ca40159e..de2222aaa3622dc631a65ba9b2e1c9bb98e8b720 100644 (file)
--- a/auth.h
+++ b/auth.h
@@ -123,6 +123,7 @@ void        krb5_cleanup_proc(Authctxt *authctxt);
 #endif /* KRB5 */
 
 #if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
+#include <shadow.h>
 int auth_shadow_acctexpired(struct spwd *);
 int auth_shadow_pwexpired(Authctxt *);
 #endif