===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sudo/Attic/check.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/sudo/Attic/check.c	2004/09/28 15:10:50	1.12
--- src/usr.bin/sudo/Attic/check.c	2005/05/31 21:13:43	1.13
***************
*** 316,322 ****
      dirparent = def_timestampdir;
      len = easprintf(timestampdir, "%s/%s", dirparent, user_name);
      if (len >= PATH_MAX)
! 	log_error(0, "timestamp path too long: %s", timestampdir);
  
      /*
       * Timestamp file may be a file in the directory or NUL to use
--- 316,322 ----
      dirparent = def_timestampdir;
      len = easprintf(timestampdir, "%s/%s", dirparent, user_name);
      if (len >= PATH_MAX)
! 	log_error(0, "timestamp path too long: %s", *timestampdir);
  
      /*
       * Timestamp file may be a file in the directory or NUL to use
***************
*** 335,346 ****
  	else
  	    len = easprintf(timestampfile, "%s/%s/%s", dirparent, user_name, p);
  	if (len >= PATH_MAX)
! 	    log_error(0, "timestamp path too long: %s", timestampfile);
      } else if (def_targetpw) {
  	len = easprintf(timestampfile, "%s/%s/%s", dirparent, user_name,
  	    *user_runas);
  	if (len >= PATH_MAX)
! 	    log_error(0, "timestamp path too long: %s", timestampfile);
      } else
  	*timestampfile = NULL;
  }
--- 335,346 ----
  	else
  	    len = easprintf(timestampfile, "%s/%s/%s", dirparent, user_name, p);
  	if (len >= PATH_MAX)
! 	    log_error(0, "timestamp path too long: %s", *timestampfile);
      } else if (def_targetpw) {
  	len = easprintf(timestampfile, "%s/%s/%s", dirparent, user_name,
  	    *user_runas);
  	if (len >= PATH_MAX)
! 	    log_error(0, "timestamp path too long: %s", *timestampfile);
      } else
  	*timestampfile = NULL;
  }
***************
*** 465,471 ****
  		/* If bad uid or file mode, complain and kill the bogus file. */
  		if (sb.st_uid != timestamp_uid) {
  		    log_error(NO_EXIT,
! 			"%s owned by uid %ud, should be uid %lu",
  			timestampfile, (unsigned long) sb.st_uid,
  			(unsigned long) timestamp_uid);
  		    (void) unlink(timestampfile);
--- 465,471 ----
  		/* If bad uid or file mode, complain and kill the bogus file. */
  		if (sb.st_uid != timestamp_uid) {
  		    log_error(NO_EXIT,
! 			"%s owned by uid %lu, should be uid %lu",
  			timestampfile, (unsigned long) sb.st_uid,
  			(unsigned long) timestamp_uid);
  		    (void) unlink(timestampfile);