Merge from 2-1

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

diff --git a/etc/afpd/afp_config.c b/etc/afpd/afp_config.c
index 4b3870939a4b3cf90d50155fbb06f562b690643b..cb836b81a7a19e7a760fbc1e77df1bf3cf077bf4 100644 (file)
--- a/etc/afpd/afp_config.c
+++ b/etc/afpd/afp_config.c
@@ -96,6 +96,9 @@ void configfree(AFPConfig *configs, const AFPConfig *config)
         }
         free(p);
     }
+
+    /* the master loaded the volumes for zeroconf, get rid of that */
+    unload_volumes_and_extmap();
 }
 
 #ifdef USE_SRVLOC
@@ -606,8 +609,7 @@ AFPConfig *configinit(struct afp_options *cmdline)
         first = AFPConfigInit(cmdline, cmdline);
 
     /* Now register with zeroconf, we also need the volumes for that */
-    readvolfile(&first->obj, &first->obj.options.systemvol, NULL, 0, NULL);
-
+    load_volumes(&first->obj);
     zeroconf_register(first);
 
     return first;