Merge remote branch 'sf/branch-allea' into branch-allea

diff --combined etc/afpd/afp_config.c
index cdc9e4f0100ff50f8cf297cec0815d97d748d4f4,9ee170099f976c5902c3fb7be65f6e2568878cfd..121c2124c04cd93b7c4b5d28ff28215c53cbf521
--- 1/etc/afpd/afp_config.c
--- 2/etc/afpd/afp_config.c
+++ b/etc/afpd/afp_config.c
@@@ -26,8 -26,6 +26,8 @@@
  #include <atalk/server_child.h>
  #include <atalk/globals.h>
  #include <atalk/errchk.h>
 +#include <atalk/netatalk_conf.h>
 +#include <atalk/fce_api.h>
  
  #ifdef HAVE_LDAP
  #include <atalk/ldapconfig.h>
@@@ -76,7 -74,6 +76,7 @@@ int configinit(AFPObj *obj
      EC_INIT;
      DSI *dsi, **next = &obj->dsi;
      char *p = NULL, *q = NULL;
 +    const char *r;
  
      auth_load(obj->options.uampath, obj->options.uamlist);
      set_signature(&obj->options);
@@@ -117,27 -114,27 +117,27 @@@
          EC_FAIL;
  
  #ifdef HAVE_LDAP
-     /* Parse afp_ldap.conf */
+     /* Parse afp.conf */
      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);
 +        load_volumes(obj, NULL);
          zeroconf_register(obj);
      }
  
 -    if ((p = iniparser_getstring(obj->iniconfig, INISEC_AFP, "fcelistener", NULL))) {
 -              LOG(log_note, logtype_afpd, "Adding FCE listener: %s", p);
 -              fce_add_udp_socket(p);
 +    if ((r = iniparser_getstring(obj->iniconfig, INISEC_AFP, "fcelistener", NULL))) {
 +              LOG(log_note, logtype_afpd, "Adding FCE listener: %s", r);
 +              fce_add_udp_socket(r);
      }
 -    if ((p = iniparser_getstring(obj->iniconfig, INISEC_AFP, "fcecoalesce", NULL))) {
 -              LOG(log_note, logtype_afpd, "Fce coalesce: %s", p);
 -              fce_set_coalesce(p);
 +    if ((r = iniparser_getstring(obj->iniconfig, INISEC_AFP, "fcecoalesce", NULL))) {
 +              LOG(log_note, logtype_afpd, "Fce coalesce: %s", r);
 +              fce_set_coalesce(r);
      }
 -    if ((p = iniparser_getstring(obj->iniconfig, INISEC_AFP, "fceevents", NULL))) {
 -              LOG(log_note, logtype_afpd, "Fce events: %s", p);
 -              fce_set_events(p);
 +    if ((r = iniparser_getstring(obj->iniconfig, INISEC_AFP, "fceevents", NULL))) {
 +              LOG(log_note, logtype_afpd, "Fce events: %s", r);
 +              fce_set_events(r);
      }