netatalk: fix a crash on Solaris when registering with mDNS

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

diff --git a/etc/afpd/afp_config.c b/etc/afpd/afp_config.c
index c7246f1f2d4c4206292fb69ac3c063d5dd39865b..2082a318c9060fe2cb8ff7b3f6e04a894ad3d4b9 100644 (file)
--- a/etc/afpd/afp_config.c
+++ b/etc/afpd/afp_config.c
@@ -40,7 +40,6 @@
 #include "uam_auth.h"
 #include "status.h"
 #include "volume.h"
-#include "afp_zeroconf.h"
 
 /*!
  * Free and cleanup config and DSI
@@ -55,9 +54,6 @@ void configfree(AFPObj *obj, DSI *dsi)
     if (!dsi) {
         /* Master afpd reloading config */
         auth_unload();
-        if (! (obj->options.flags & OPTION_NOZEROCONF)) {
-            zeroconf_deregister();
-        }
     }
 
     unload_volumes(obj);
@@ -207,12 +203,6 @@ int configinit(AFPObj *obj)
     acl_ldap_readconfig(obj->iniconfig);
 #endif /* HAVE_LDAP */
 
-    /* Now register with zeroconf, we also need the volumes for that */
-    if (! (obj->options.flags & OPTION_NOZEROCONF)) {
-        load_volumes(obj, lv_all);
-        zeroconf_register(obj);
-    }
-
     if ((r = atalk_iniparser_getstring(obj->iniconfig, INISEC_GLOBAL, "fce listener", NULL))) {
                LOG(log_note, logtype_afpd, "Adding FCE listener: %s", r);
                fce_add_udp_socket(r);
@@ -225,6 +215,19 @@ int configinit(AFPObj *obj)
                LOG(log_note, logtype_afpd, "Fce events: %s", r);
                fce_set_events(r);
     }
+    r = atalk_iniparser_getstring(obj->iniconfig, INISEC_GLOBAL, "fce version", "1");
+    LOG(log_debug, logtype_afpd, "Fce version: %s", r);
+    obj->fce_version = atoi(r);
+
+    if ((r = atalk_iniparser_getstring(obj->iniconfig, INISEC_GLOBAL, "fce ignore names", ".DS_Store"))) {
+        obj->fce_ign_names = strdup(r);
+    }
+
+    if ((r = atalk_iniparser_getstring(obj->iniconfig, INISEC_GLOBAL, "fce notify script", NULL))) {
+        obj->fce_notify_script = strdup(r);
+    }
+
+
 
 EC_CLEANUP:
     if (q)