return 1;
}
- if (afp_config_parse(&obj) != 0)
+ if (afp_config_parse(&obj, "") != 0)
return 1;
if (load_volumes(&obj, NULL) != 0)
/* Log SIGBUS/SIGSEGV SBT */
fault_setup(NULL);
- if (afp_config_parse(&obj) != 0)
+ if (afp_config_parse(&obj, "afpd") != 0)
afp_exit(EXITERR_CONF);
- set_processname("afpd");
- setuplog(obj.options.logconfig, obj.options.logfile);
-
/* Save the user's current umask */
obj.options.save_mask = umask(obj.options.umask);
setuplog("default:debug", "/dev/tty");
/* Load config */
- if (afp_config_parse(&obj) != 0) {
+ if (afp_config_parse(&obj, "") != 0) {
dbd_log( LOGSTD, "Couldn't load afp.conf");
exit(EXIT_FAILURE);
}
if (!debug && daemonize(0, 0) != 0)
exit(EXITERR_SYS);
- if (afp_config_parse(&obj) != 0)
+ if (afp_config_parse(&obj, "cnid_metad") != 0)
daemon_exit(1);
- set_processname("cnid_metad");
- setuplog(obj.options.logconfig, obj.options.logfile);
-
if (load_volumes(&obj, NULL) != 0)
daemon_exit(1);
exit(EXIT_FAILURE);
}
- EC_ZERO( afp_config_parse(&obj) );
-
- set_processname("cnid_dbd");
- setuplog(obj.options.logconfig, obj.options.logfile);
+ EC_ZERO( afp_config_parse(&obj, "cnid_dbd") );
EC_ZERO( load_volumes(&obj, NULL) );
EC_NULL( vol = getvolbypath(&obj, volpath) );
sigfillset(&blocksigs);
sigprocmask(SIG_SETMASK, &blocksigs, NULL);
- if (afp_config_parse(&obj) != 0)
+ if (afp_config_parse(&obj, "netatalk") != 0)
netatalk_exit(EXITERR_CONF);
- set_processname("netatalk");
- setuplog(obj.options.logconfig, obj.options.logfile);
event_set_log_callback(libevent_logmsg_cb);
event_set_fatal_callback(netatalk_exit);
#include <atalk/globals.h>
#include <atalk/volume.h>
-extern int afp_config_parse(AFPObj *obj);
+extern int afp_config_parse(AFPObj *obj, char *processname);
extern int load_charset(struct vol *vol);
extern int load_volumes(AFPObj *obj, void (*delvol_fn)(struct vol *));
/*!
* Initialize an AFPObj and options from ini config file
*/
-int afp_config_parse(AFPObj *AFPObj)
+int afp_config_parse(AFPObj *AFPObj, char *processname)
{
EC_INIT;
dictionary *config;
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);
+ }
+
/* "server options" boolean options */
if (!iniparser_getboolean(config, INISEC_GLOBAL, "zeroconf", 1))
options->flags |= OPTION_NOZEROCONF;
TEST( afp_options_parse_cmdline(&obj, 3, &args[0]) );
- TEST_int( afp_config_parse(&obj), 0);
+ TEST_int( afp_config_parse(&obj, ""), 0);
TEST_int( configinit(&obj), 0);
TEST( cnid_init() );
TEST( load_volumes(&obj, NULL) );