From 9523c29e49bb54799686fd73b0b1eef9e31c35d3 Mon Sep 17 00:00:00 2001 From: Alex 'AdUser' Z Date: Sat, 3 Dec 2016 19:02:34 +1000 Subject: [PATCH] * fix setting uid/git & daemon options --- src/appconfig.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/appconfig.c b/src/appconfig.c index f7f812e..7969dfe 100644 --- a/src/appconfig.c +++ b/src/appconfig.c @@ -29,21 +29,19 @@ f2b_appconfig_update(f2b_config_section_t *section) { if (!section) return; - /* set uid & gid. note: set only once if root */ - if (appconfig.uid == 0 && (pa = f2b_config_param_find(section->param, "user")) != NULL) { + if ((pa = f2b_config_param_find(section->param, "user")) != NULL) { struct passwd *pw; if ((pw = getpwnam(pa->value)) != NULL) appconfig.uid = pw->pw_uid, appconfig.gid = pw->pw_gid; } - if (appconfig.gid == 0 && (pa = f2b_config_param_find(section->param, "group")) != NULL) { + if ((pa = f2b_config_param_find(section->param, "group")) != NULL) { struct group *grp; if ((grp = getgrnam(pa->value)) != NULL) appconfig.gid = grp->gr_gid; } - if (appconfig.daemon == false && (pa = f2b_config_param_find(section->param, "daemon")) != NULL) { - if (strcmp(pa->value, "yes") == 0) - appconfig.daemon = true; + if ((pa = f2b_config_param_find(section->param, "daemon")) != NULL) { + appconfig.daemon = (strcmp(pa->value, "yes") == 0) ? true : false; } if ((pa = f2b_config_param_find(section->param, "pidfile")) != NULL)