Merge from branch-2-1

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

diff --git a/etc/afpd/afp_config.c b/etc/afpd/afp_config.c
index d53dee14d4f637165c98c8804593596e453ca375..5bd87f906aa4d349f3630f3cd38159a2c70d6192 100644 (file)
--- a/etc/afpd/afp_config.c
+++ b/etc/afpd/afp_config.c
@@ -48,7 +48,7 @@ char *strchr (), *strrchr ();
 #ifdef USE_SRVLOC
 #include <slp.h>
 #endif /* USE_SRVLOC */
-#ifdef HAVE_ACLS
+#ifdef HAVE_LDAP
 #include <atalk/ldapconfig.h>
 #endif
 
@@ -56,6 +56,8 @@ char *strchr (), *strrchr ();
 #include "afp_config.h"
 #include "uam_auth.h"
 #include "status.h"
+#include "volume.h"
+#include "afp_zeroconf.h"
 
 #define LINESIZE 1024  
 
@@ -94,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
@@ -154,9 +159,6 @@ static char * srvloc_encode(const struct afp_options *options, const char *name)
        return buf;
 }
 #endif /* USE_SRVLOC */
-#ifdef USE_ZEROCONF
-#include "afp_zeroconf.h"
-#endif /* USE_ZEROCONF */
 
 static void dsi_cleanup(const AFPConfig *config)
 {
@@ -193,14 +195,6 @@ static void dsi_cleanup(const AFPConfig *config)
 srvloc_dereg_err:
     dsi->srvloc_url[0] = '\0';
     SLPClose(hslp);
-#elif defined (USE_ZEROCONF)
-    DSI *dsi = (DSI *)config->obj.handle;
-
-    /*  Do nothing if we didn't register.  */
-    if (!dsi || dsi->zeroconf_registered == 0)
-        return;
-
-    zeroconf_deregister();
 #endif /* USE_SRVLOC */
 }
 
@@ -381,10 +375,10 @@ static AFPConfig *DSIConfigInit(const struct afp_options *options,
     }
 
     if (options->flags & OPTION_PROXY) {
-        LOG(log_info, logtype_afpd, "AFP/TCP proxy initialized for %s:%d (%s)",
+        LOG(log_note, logtype_afpd, "AFP/TCP proxy initialized for %s:%d (%s)",
             getip_string((struct sockaddr *)&dsi->server), getip_port((struct sockaddr *)&dsi->server), VERSION);
     } else {
-        LOG(log_info, logtype_afpd, "AFP/TCP started, advertising %s:%d (%s)",
+        LOG(log_note, logtype_afpd, "AFP/TCP started, advertising %s:%d (%s)",
             getip_string((struct sockaddr *)&dsi->server), getip_port((struct sockaddr *)&dsi->server), VERSION);
     }
 
@@ -464,36 +458,6 @@ srvloc_reg_err:
     }
 #endif /* USE_SRVLOC */
 
-#ifdef USE_ZEROCONF
-    uint afp_port;
-    const char *hostname = NULL;
-
-    dsi->zeroconf_registered = 0; /*  Mark that we haven't registered.  */
-
-    if (!(options->flags & OPTION_NOZEROCONF)) {
-        /* XXX We don't want to tack on the port number if we don't have to.
-          * Why?
-          * Well, this seems to break MacOS < 10.  If the user _really_ wants to
-          * use a non-default port, they can, but be aware, this server might
-          * not show up int the Network Browser.
-          */
-        afp_port = getip_port((struct sockaddr *)&dsi->server);
-
-        /* If specified use the FQDN to register with srvloc, otherwise use IP. */
-        p = NULL;
-        if (options->fqdn) {
-            hostname = options->fqdn;
-            p = strchr(hostname, ':');
-        }  else {
-            hostname = getip_string((struct sockaddr *)&dsi->server);
-        }
-
-        zeroconf_register(afp_port, hostname);
-        dsi->zeroconf_registered = 1; /*  Mark that we have registered.  */
-        config->server_cleanup = dsi_cleanup;
-    }
-#endif /* USE_ZEROCONF */
-
     config->fd = dsi->serversock;
     config->obj.handle = dsi;
     config->obj.config = config;
@@ -516,7 +480,7 @@ srvloc_reg_err:
 /* allocate server configurations. this should really store the last
  * entry in config->last or something like that. that would make
  * supporting multiple dsi transports easier. */
-static AFPConfig *AFPConfigInit(const struct afp_options *options,
+static AFPConfig *AFPConfigInit(struct afp_options *options,
                                 const struct afp_options *defoptions)
 {
     AFPConfig *config = NULL, *next = NULL;
@@ -583,11 +547,6 @@ AFPConfig *configinit(struct afp_options *cmdline)
     struct afp_options options;
     AFPConfig *config=NULL, *first = NULL; 
 
-#ifdef HAVE_ACLS
-    /* Parse afp_ldap.conf first so we can set the uuid option */
-    acl_ldap_readconfig(_PATH_ACL_LDAPCONF);
-#endif /* HAVE_ACLS */
-
     /* if config file doesn't exist, load defaults */
     if ((fp = fopen(cmdline->configfile, "r")) == NULL)
     {
@@ -621,15 +580,7 @@ AFPConfig *configinit(struct afp_options *cmdline)
         if (!afp_options_parseline(p, &options))
             continue;
 
-#ifdef HAVE_ACLS
-       /* Enable UUID support if LDAP config is complete */
-        if (ldap_config_valid) {
-            LOG(log_info, logtype_afpd, "Enabling UUID support");
-            options.flags |= OPTION_UUID;
-        }
-#endif /* HAVE_ACLS */
-
-        /* this should really get a head and a tail to simplify things. */
+        /* AFPConfigInit can return two linked configs due to DSI and ASP */
         if (!first) {
             if ((first = AFPConfigInit(&options, cmdline)))
                 config = first->next ? first->next : first;
@@ -638,11 +589,20 @@ AFPConfig *configinit(struct afp_options *cmdline)
         }
     }
 
+#ifdef HAVE_LDAP
+    /* Parse afp_ldap.conf */
+    acl_ldap_readconfig(_PATH_ACL_LDAPCONF);
+#endif /* HAVE_LDAP */
+
     LOG(log_debug, logtype_afpd, "Finished parsing Config File");
     fclose(fp);
 
     if (!have_option)
         first = AFPConfigInit(cmdline, cmdline);
 
+    /* Now register with zeroconf, we also need the volumes for that */
+    load_volumes(&first->obj);
+    zeroconf_register(first);
+
     return first;
 }