Relevant BUGIDs: 476985

Purpose of commit: bugfix

Commit summary:
---------------
Nalin's fix to do a better job of not corrupting the lastlog file.

diff --git a/CHANGELOG b/CHANGELOG
index 288873f9e71686d4e0d329e0588166a41fa53c34..800d50698627ffdffa84d56ec244f0482e4e5768 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -49,6 +49,7 @@ bug report - outstanding bugs are listed here:
 0.76: please submit patches for this section with actual code/doc
       patches!
 
+* pam_tally: Nalin's fix for lastlog corruption (Bug 476985 - agmorgan)
 * pam_rhosts: Nalin adds support for '+hostname', and zdd fix
   compilation warning. (Bug 476986 - agmorgan)
 * pam_motd: Nalin fixed compiler warning. (Bug 476938 - agmorgan)

diff --git a/modules/pam_tally/pam_tally.c b/modules/pam_tally/pam_tally.c
index 651a758b4fa58e5b6be3fc1570220f8530421c4e..e0b60decb8e19e80380272d32235afdd9bee47b7 100644 (file)
--- a/modules/pam_tally/pam_tally.c
+++ b/modules/pam_tally/pam_tally.c
@@ -17,6 +17,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdarg.h>
+#include <stdlib.h>
 #include <syslog.h>
 #include <pwd.h>
 #include <time.h>
@@ -185,14 +186,24 @@ static int get_tally( tally_t *tally,
     if ( fseek( *TALLY, uid * sizeof(struct faillog), SEEK_SET ) ) {
           _pam_log(LOG_ALERT, "fseek failed %s", filename);
                 return PAM_AUTH_ERR;
-     }
+    }
                     
+    if ( fileinfo.st_size <= uid * sizeof(struct faillog) ) {
+
+       memset(fsp, 0, sizeof(struct faillog));
+       *tally=0;
+       fsp->fs_faillog.fail_time = time(NULL);
+
+    } else if (( fread((char *) &fsp->fs_faillog,
+                      sizeof(struct faillog), 1, *TALLY) )==0 ) {
+
+       *tally=0; /* Assuming a gappy filesystem */
+
+    } else {
+
+       *tally = fsp->fs_faillog.fail_cnt;
 
-    if (( fread((char *) &fsp->fs_faillog,
-               sizeof(struct faillog), 1, *TALLY) )==0 ) {
-          *tally=0; /* Assuming a gappy filesystem */
     }
-    *tally = fsp->fs_faillog.fail_cnt;    
               
     return PAM_SUCCESS;
   }
@@ -216,8 +227,8 @@ static int set_tally( tally_t tally,
         fsp->fs_faillog.fail_cnt = tally;                                    
         if (fwrite((char *) &fsp->fs_faillog,
                   sizeof(struct faillog), 1, *TALLY)==0 ) {
-          _pam_log(LOG_ALERT, "tally update (fputc) failed.", filename);
-          return PAM_AUTH_ERR;
+           _pam_log(LOG_ALERT, "tally update (fwrite) failed.", filename);
+           return PAM_AUTH_ERR;
         }
       }
     
@@ -313,21 +324,22 @@ static int tally_bump (int inc,
 
     /* to remember old fail time (for locktime) */
     fsp->fs_fail_time = fsp->fs_faillog.fail_time;
-    fsp->fs_faillog.fail_time = (time_t) time( (time_t *) 0);
+    fsp->fs_faillog.fail_time = time(NULL);
     (void) pam_get_item(pamh, PAM_RHOST, (const void **)&remote_host);
-    if (!remote_host)
-    {
+    if (!remote_host) {
+
        (void) pam_get_item(pamh, PAM_TTY, (const void **)&cur_tty);
-       if (!cur_tty)
-           strcpy(fsp->fs_faillog.fail_line, "unknown");
-       else {
+       if (!cur_tty) {
+           strncpy(fsp->fs_faillog.fail_line, "unknown",
+                   sizeof(fsp->fs_faillog.fail_line) - 1);
+           fsp->fs_faillog.fail_line[sizeof(fsp->fs_faillog.fail_line)-1] = 0;
+       } else {
            strncpy(fsp->fs_faillog.fail_line, cur_tty,
-                   (size_t)sizeof(fsp->fs_faillog.fail_line));
+                   sizeof(fsp->fs_faillog.fail_line)-1);
            fsp->fs_faillog.fail_line[sizeof(fsp->fs_faillog.fail_line)-1] = 0;
        }
-    }
-    else
-    {
+
+    } else {
        strncpy(fsp->fs_faillog.fail_line, remote_host,
                (size_t)sizeof(fsp->fs_faillog.fail_line));
        fsp->fs_faillog.fail_line[sizeof(fsp->fs_faillog.fail_line)-1] = 0;
@@ -503,15 +515,14 @@ PAM_FUNCTION( pam_sm_acct_mgmt ) {
       if (fsp->fs_faillog.fail_locktime && fsp->fs_fail_time
          && (!no_lock_time) )
       {
-       if ( (fsp->fs_faillog.fail_locktime + fsp->fs_fail_time)
-            > (time_t)time((time_t)0) )
+       if ( (fsp->fs_faillog.fail_locktime + fsp->fs_fail_time) > time(NULL) )
        { 
                _pam_log(LOG_NOTICE,
                         "user %s ("UID_FMT") has time limit [%lds left]"
                         " since last failure.",
                         user,uid,
                         fsp->fs_fail_time+fsp->fs_faillog.fail_locktime
-                        -(time_t)time((time_t)0));
+                        -time(NULL));
                return PAM_AUTH_ERR;
        }
       }
@@ -690,7 +701,6 @@ int main ( int argc, char **argv ) {
       if ( ! fread((char *) &fsp->fs_faillog,
                   sizeof (struct faillog), 1, TALLY)
           || ! fsp->fs_faillog.fail_cnt ) {
-       tally=fsp->fs_faillog.fail_cnt;
        continue;
        }
       tally = fsp->fs_faillog.fail_cnt;