Attachment 15899 Details for Bug 48934

[patch] Proposed patch, extracted from fixed Debian package and seperated from another patch

mod_auth_shadow.dif (text/plain), 1.95 KB, created by Peter Poeml on 2004-02-06 20:59:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Poeml

Created: 2004-02-06 20:59:00 UTC

Size: 1.95 KB

patch

obsolete

>--- mod_auth_shadow-1.3.orig/validate.c
>+++ mod_auth_shadow-1.3/validate.c
>@@ -43,6 +42,7 @@
>     char pw[MAX_PW_LENGTH+2];
>     char *cryptpw;
>     char *progname;
>+    long int secs, days;
> 
>     progname = argv[0];
>     
>@@ -92,6 +88,43 @@
>         if ( (SLEEP_SECONDS>0) && (sleep(SLEEP_SECONDS)!=0)) 
>             fprintf(stderr,"%s: Error sleeping for %d seconds.\n", progname,SLEEP_SECONDS);
>         fprintf(stderr,"%s: User %s: authentication failure\n",progname,user);
>+        exit(1);
>+    }
>+
>+    /*
>+     * Check password expiration information. See shadow(5)
>+     */
>+    secs = (long int) time(NULL);
>+    days = secs / (24L * 60L * 60L);
>+    /*
>+     *   An  account is considered to be inactive and is disabled if the
>+     *   password is not changed within the specified number of days after the
>+     *   password expires.
>+     */
>+    if (   ret->sp_max > 0
>+        && ret->sp_inact > 0
>+	&& ret->sp_lstchg != 0
>+        && days > (ret->sp_lstchg + ret->sp_max + ret->sp_inact)) {
>+#ifdef LOG_FAILED_ATTEMPTS
>+        syslog(LOG_ERR,"VALIDATE: user: %s, Account inactivity period expired",user);
>+#endif
>+        if ( (SLEEP_SECONDS>0) && (sleep(SLEEP_SECONDS)!=0))
>+            fprintf(stderr,"%s: Error sleeping for %d seconds.\n", progname,SLEEP_SECONDS);
>+        fprintf(stderr,"%s: User %s: account inactivity period expired\n",progname,user);
>+        exit(1);
>+    }
>+
>+    /*
>+     * An account will also be disabled  on the specified day regardless of
>+     * other password expiration information.
>+     */
>+    if (ret->sp_expire > 0 && ret->sp_lstchg != 0 && days > ret->sp_expire) {
>+#ifdef LOG_FAILED_ATTEMPTS
>+        syslog(LOG_ERR,"VALIDATE: user: %s, Account expired",user);
>+#endif
>+        if ( (SLEEP_SECONDS>0) && (sleep(SLEEP_SECONDS)!=0))
>+            fprintf(stderr,"%s: Error sleeping for %d seconds.\n", progname,SLEEP_SECONDS);
>+        fprintf(stderr,"%s: User %s: account expired\n",progname,user);
>         exit(1);
>     }
>     exit(0);

Actions: View | Diff

Attachments on bug 48934: 15899