Pass name to afp_config_parse and use NULL for processname as test

[netatalk.git] / libatalk / util / netatalk_conf.c

diff --git a/libatalk/util/netatalk_conf.c b/libatalk/util/netatalk_conf.c
index 26c80f112e4812b86b51ec953d21492c533bab7b..a3cd87e7a551b77919ade214054720473eb56df4 100644 (file)
--- a/libatalk/util/netatalk_conf.c
+++ b/libatalk/util/netatalk_conf.c
@@ -1404,6 +1404,9 @@ int afp_config_parse(AFPObj *AFPObj, char *processname)
     char *q, *r;
     char val[MAXVAL];
 
+    if (processname != NULL)
+        set_processname(processname);
+
     AFPObj->afp_version = 11;
     options->configfile  = AFPObj->cmdlineconfigfile ? strdup(AFPObj->cmdlineconfigfile) : strdup(_PATH_CONFDIR "afp.conf");
     options->sigconffile = strdup(_PATH_STATEDIR "afp_signature.conf");
@@ -1418,10 +1421,7 @@ int afp_config_parse(AFPObj *AFPObj, char *processname)
     options->logconfig = iniparser_getstrdup(config, INISEC_GLOBAL, "log level", "default:note");
     options->logfile   = iniparser_getstrdup(config, INISEC_GLOBAL, "log file",  NULL);
 
-    if (processname[0] != '\0') {
-        set_processname(processname);
-        setuplog(options->logconfig, options->logfile);
-    }
+    setuplog(options->logconfig, options->logfile);
 
     /* "server options" boolean options */
     if (!iniparser_getboolean(config, INISEC_GLOBAL, "zeroconf", 1))