Merge sf

[netatalk.git] / etc / afpd / main.c

diff --git a/etc/afpd/main.c b/etc/afpd/main.c
index 13305a1efa58f4182d8c8f4b3b93e89489fc011a..ca35cc8d1bf92f93fe5552a00e5a5cfd4b721d9d 100644 (file)
--- a/etc/afpd/main.c
+++ b/etc/afpd/main.c
@@ -31,6 +31,7 @@
 #include <atalk/server_ipc.h>
 #include <atalk/errchk.h>
 #include <atalk/globals.h>
+#include <atalk/netatalk_conf.h>
 
 #include "afp_config.h"
 #include "status.h"
@@ -220,9 +221,7 @@ int main(int ac, char **av)
     int                 ret;
 
     /* Parse argv args and initialize default options */
-    afp_options_parse_cmdline(ac, av);
-    if (afp_config_parse(&obj) != 0)
-        exit(EXITERR_CONF);
+    afp_options_parse_cmdline(&obj, ac, av);
 
     if (check_lockfile("afpd", _PATH_AFPDLOCK) != 0)
         exit(EXITERR_SYS);
@@ -237,6 +236,12 @@ int main(int ac, char **av)
     fault_setup(NULL);
     atexit(afp_exit);
 
+    if (afp_config_parse(&obj) != 0)
+        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);