From 0ea28240053521a309698413a426b4d730a3d60c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Sun, 26 Apr 2015 11:33:01 +0000 Subject: Merge upstream r3375 and r3376 which fix a segfault on startup when the user specified in the configuration file does not exist. PR: 197534 --- util/config_file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'util') diff --git a/util/config_file.c b/util/config_file.c index 5c4e897da373..9c427ed0d4f5 100644 --- a/util/config_file.c +++ b/util/config_file.c @@ -1211,10 +1211,10 @@ void config_lookup_uid(struct config_file* cfg) /* translate username into uid and gid */ if(cfg->username && cfg->username[0]) { struct passwd *pwd; - if((pwd = getpwnam(cfg->username)) == NULL) - log_err("user '%s' does not exist.", cfg->username); - cfg_uid = pwd->pw_uid; - cfg_gid = pwd->pw_gid; + if((pwd = getpwnam(cfg->username)) != NULL) { + cfg_uid = pwd->pw_uid; + cfg_gid = pwd->pw_gid; + } } #else (void)cfg; -- cgit v1.2.3