added BAD_STAMPDIR and BAD_STAMPFILE

diff --git a/logging.c b/logging.c
index c0a60af120dbdd5b733d7e9eb0859153cba93f6a..bb98aca46c12fb8efae6ad7849485c5e27e0a382 100644 (file)
--- a/logging.c
+++ b/logging.c
@@ -255,6 +255,24 @@ void log_error(code)
 #endif /* LOGGING & SLOG_SYSLOG */
            break;
 
+       case BAD_STAMPDIR:
+           (void) sprintf(p,
+           "%s owned by non-root or not mode 0700; TTY=%s ; PWD=%s ; COMMAND=",
+           _PATH_SUDO_TIMEDIR, tty, cwd);
+#if (LOGGING & SLOG_SYSLOG)
+           pri = Syslog_priority_NO;
+#endif /* LOGGING & SLOG_SYSLOG */
+           break;
+
+       case BAD_STAMPFILE:
+           (void) sprintf(p,
+               "preposterous stampfile date; TTY=%s ; PWD=%s ; COMMAND=",
+               tty, cwd);
+#if (LOGGING & SLOG_SYSLOG)
+           pri = Syslog_priority_NO;
+#endif /* LOGGING & SLOG_SYSLOG */
+           break;
+
        default:
            strcat(p, "found a wierd error : ");
 #if (LOGGING & SLOG_SYSLOG)
@@ -562,7 +580,7 @@ void inform_user(code)
 
        case GLOBAL_NO_PW_ENT:
            (void) fprintf(stderr,
-               "Intruder Alert!  You don\'t exist in the passwd file\n\n");
+               "Intruder Alert!  You don't exist in the passwd file\n\n");
            break;
 
        case GLOBAL_NO_AUTH_ENT:
@@ -622,6 +640,16 @@ void inform_user(code)
                cmnd);
            break;
 
+       case BAD_STAMPDIR:
+           (void) fprintf(stderr,
+               "Timestamp directory has wrong permissions, ignoring.\n");
+           break;
+
+       case BAD_STAMPFILE:
+           (void) fprintf(stderr,
+               "Your timestamp file has a preposterous date, ignoring.\n");
+           break;
+
        default:
            (void) fprintf(stderr,
                "Something wierd happened.\n\n");
@@ -676,6 +704,8 @@ static int appropriate(code)
     case VALIDATE_ERROR:
     case NO_SUDOERS_FILE:
     case SPOOF_ATTEMPT:
+    case BAD_STAMPDIR:
+    case BAD_STAMPFILE:
     default:
        return (1);
        break;

diff --git a/sudo.h b/sudo.h
index 0cf2c7d9f1240ab739c9307a9418b0ce0db6a203..b04ab467f220bc1435fd3c9ffe819e477ed8d9e4 100644 (file)
--- a/sudo.h
+++ b/sudo.h
@@ -121,6 +121,8 @@ extern int top;
 #define SUDOERS_NOT_FILE         ( 0x0B | GLOBAL_PROBLEM )
 #define SUDOERS_RW_OTHER         ( 0x0C | GLOBAL_PROBLEM )
 #define SPOOF_ATTEMPT            0x0D
+#define BAD_STAMPDIR             0x0E
+#define BAD_STAMPFILE            0x0F
 
 /*
  * Boolean values