[BACK]Return to check.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / sudo

Diff for /src/usr.bin/sudo/Attic/check.c between version 1.5 and 1.5.2.1

version 1.5, 2001/03/30 13:56:57 version 1.5.2.1, 2002/01/18 17:20:22
Line 1 
Line 1 
 /*  /*
  * Copyright (c) 1994-1996,1998-1999 Todd C. Miller <Todd.Miller@courtesan.com>   * Copyright (c) 1993-1996,1998-2001 Todd C. Miller <Todd.Miller@courtesan.com>
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
Line 34 
Line 34 
   
 #include "config.h"  #include "config.h"
   
   #include <sys/types.h>
   #include <sys/param.h>
   #include <sys/stat.h>
   #include <sys/file.h>
 #include <stdio.h>  #include <stdio.h>
 #ifdef STDC_HEADERS  #ifdef STDC_HEADERS
 #include <stdlib.h>  # include <stdlib.h>
   # include <stddef.h>
   #else
   # ifdef HAVE_STDLIB_H
   #  include <stdlib.h>
   # endif
 #endif /* STDC_HEADERS */  #endif /* STDC_HEADERS */
 #ifdef HAVE_UNISTD_H  
 #include <unistd.h>  
 #endif /* HAVE_UNISTD_H */  
 #ifdef HAVE_STRING_H  #ifdef HAVE_STRING_H
 #include <string.h>  # include <string.h>
   #else
   # ifdef HAVE_STRINGS_H
   #  include <strings.h>
   # endif
 #endif /* HAVE_STRING_H */  #endif /* HAVE_STRING_H */
 #ifdef HAVE_STRINGS_H  #ifdef HAVE_UNISTD_H
 #include <strings.h>  # include <unistd.h>
 #endif /* HAVE_STRINGS_H */  #endif /* HAVE_UNISTD_H */
 #include <errno.h>  #include <errno.h>
 #include <fcntl.h>  #include <fcntl.h>
 #include <signal.h>  #include <signal.h>
 #include <time.h>  #include <time.h>
 #include <sys/param.h>  
 #include <sys/types.h>  
 #include <sys/stat.h>  
 #include <sys/file.h>  
 #include <pwd.h>  #include <pwd.h>
 #include <grp.h>  #include <grp.h>
   
 #include "sudo.h"  #include "sudo.h"
   
 #ifndef lint  #ifndef lint
 static const char rcsid[] = "$Sudo: check.c,v 1.194 2000/02/15 23:36:03 millert Exp $";  static const char rcsid[] = "$Sudo: check.c,v 1.202 2001/12/14 19:52:47 millert Exp $";
 #endif /* lint */  #endif /* lint */
   
 /* Status codes for timestamp_status() */  /* Status codes for timestamp_status() */
Line 226 
Line 232 
     struct group *grp;      struct group *grp;
     char **gr_mem;      char **gr_mem;
   
     if (!def_str(I_EXEMPT_GRP))      if (!def_str(I_EXEMPT_GROUP))
         return(FALSE);          return(FALSE);
   
     if (!(grp = getgrnam(def_str(I_EXEMPT_GRP))))      if (!(grp = getgrnam(def_str(I_EXEMPT_GROUP))))
         return(FALSE);          return(FALSE);
   
     if (user_gid == grp->gr_gid)      if (user_gid == grp->gr_gid)
Line 424 
Line 430 
      * If the file/dir exists, check its mtime.       * If the file/dir exists, check its mtime.
      */       */
     if (status == TS_OLD) {      if (status == TS_OLD) {
         now = time(NULL);          /* Negative timeouts only expire manually (sudo -k). */
         if (def_ival(I_TS_TIMEOUT) &&          if (def_ival(I_TIMESTAMP_TIMEOUT) < 0 && sb.st_mtime != 0)
             now - sb.st_mtime < 60 * def_ival(I_TS_TIMEOUT)) {              status = TS_CURRENT;
             /*          else {
              * Check for bogus time on the stampfile.  The clock may              now = time(NULL);
              * have been set back or someone could be trying to spoof us.              if (def_ival(I_TIMESTAMP_TIMEOUT) &&
              */                  now - sb.st_mtime < 60 * def_ival(I_TIMESTAMP_TIMEOUT)) {
             if (sb.st_mtime > now + 60 * def_ival(I_TS_TIMEOUT) * 2) {                  /*
                 log_error(NO_EXIT,                   * Check for bogus time on the stampfile.  The clock may
                     "timestamp too far in the future: %20.20s",                   * have been set back or someone could be trying to spoof us.
                     4 + ctime(&sb.st_mtime));                   */
                 if (timestampfile)                  if (sb.st_mtime > now + 60 * def_ival(I_TIMESTAMP_TIMEOUT) * 2) {
                     (void) unlink(timestampfile);                      log_error(NO_EXIT,
                 else                          "timestamp too far in the future: %20.20s",
                     (void) rmdir(timestampdir);                          4 + ctime(&sb.st_mtime));
                 status = TS_MISSING;                      if (timestampfile)
             } else                          (void) unlink(timestampfile);
                 status = TS_CURRENT;                      else
                           (void) rmdir(timestampdir);
                       status = TS_MISSING;
                   } else
                       status = TS_CURRENT;
               }
         }          }
     }      }
   
Legend:
Removed from v.1.5  
changed lines
  Added in v.1.5.2.1