From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Mon, 26 Mar 2012 15:02:06 +0000 (-0400)
Subject: If the "timestampowner" user cannot be resolved, use ROOT_UID instead
X-Git-Tag: SUDO_1_8_5~1^2~120
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9e5ea4814a92393e573727a00f52be300c026ae;p=sudo

If the "timestampowner" user cannot be resolved, use ROOT_UID instead
of exiting with a fatal error.
---

diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c
index 3f86ea19f..af72c378f 100644
--- a/plugins/sudoers/sudoers.c
+++ b/plugins/sudoers/sudoers.c
@@ -415,11 +415,14 @@ sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[],
 	    pw = sudo_getpwuid(atoi(def_timestampowner + 1));
 	else
 	    pw = sudo_getpwnam(def_timestampowner);
-	if (!pw)
-	    log_fatal(0, _("timestamp owner (%s): No such user"),
+	if (pw != NULL) {
+	    timestamp_uid = pw->pw_uid;
+	    pw_delref(pw);
+	} else {
+	    log_error(0, _("timestamp owner (%s): No such user"),
 		def_timestampowner);
-	timestamp_uid = pw->pw_uid;
-	pw_delref(pw);
+	    timestamp_uid = ROOT_UID;
+	}
     }
 
     /* If no command line args and "shell_noargs" is not set, error out. */