Commit Diff


commit - cfe15c641560134cf0cce992d489842de99f6f9ade17e71309b9891a0312e4fa
commit + 0fd3aeccd5d6b2b55130a24c844c04d9f793d77e2b77c754685574cb058aba7a
blob - cb7577e2e9a6494d7681af250c1f94c6388374b6241181ea36dce8b0fc92f211
blob + cbb12d0af2f97352a39d3d48f31b66d12b7029e670c64712af7987648772ad20
--- gotd/gotd.c	
+++ gotd/gotd.c	
@@ -3668,29 +3668,9 @@ main(int argc, char **argv)
 		    GOTD_PROC_GOTD, secrets, &gotd) != 0)
 			return 1;
 
-		pw = getpwnam(gotd.user_name);
-		if (pw == NULL) {
-			uid = strtonum(gotd.user_name, 0, UINT_MAX - 1, &errstr);
-			if (errstr == NULL)
-				pw = getpwuid(uid);
-		}
-		if (pw == NULL) {
-			error = got_error_fmt(GOT_ERR_UID,
-			    "user %s not found", gotd.user_name);
-			gotd_imsg_send_error(&ibuf, proc_id, 0, error);
-			fatalx("%s", error->msg);
-		}
-
-		if (pw->pw_uid == 0) {
-			error = got_error_fmt(GOT_ERR_UID,
-			    "cannot run %s as the superuser", getprogname());
-			gotd_imsg_send_error(&ibuf, proc_id, 0, error);
-			fatalx("%s", error->msg);
-		}
-
 		if (gethostname(hostname, sizeof(hostname)) == -1)
 			fatal("gethostname");
-		if (asprintf(&gotd.default_sender, "%s@%s", pw->pw_name,
+		if (asprintf(&gotd.default_sender, "%s@%s", gotd.user_name,
 		    hostname) == -1)
 			fatal("asprintf");
 
@@ -3767,7 +3747,7 @@ main(int argc, char **argv)
 	case GOTD_PROC_GOTD:
 		if (verbosity) {
 			log_info("socket: %s", gotd.unix_socket_path);
-			log_info("user: %s", pw->pw_name);
+			log_info("user: %s", gotd.user_name);
 		}
 		start_listener(argv0, confpath, daemonize, verbosity);
 		start_notifier(argv0, confpath, daemonize, verbosity);