#include <stdlib.h>
#include <string.h>
#include <errno.h>
-
-/* STDC check */
-#if STDC_HEADERS
#include <string.h>
-#else /* STDC_HEADERS */
-#ifndef HAVE_STRCHR
-#define strchr index
-#define strrchr index
-#endif /* HAVE_STRCHR */
-char *strchr (), *strrchr ();
-#ifndef HAVE_MEMCPY
-#define memcpy(d,s,n) bcopy ((s), (d), (n))
-#define memmove(d,s,n) bcopy ((s), (d), (n))
-#endif /* ! HAVE_MEMCPY */
-#endif /* STDC_HEADERS */
-
-#ifdef HAVE_UNISTD_H
#include <unistd.h>
-#endif /* HAVE_UNISTD_H */
#include <ctype.h>
-#include <atalk/logger.h>
-#include <atalk/util.h>
-
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#ifdef USE_SRVLOC
+#include <slp.h>
+#endif /* USE_SRVLOC */
+
+#include <atalk/logger.h>
+#include <atalk/util.h>
#include <atalk/dsi.h>
#include <atalk/atp.h>
#include <atalk/asp.h>
#include <atalk/afp.h>
#include <atalk/compat.h>
#include <atalk/server_child.h>
-#ifdef USE_SRVLOC
-#include <slp.h>
-#endif /* USE_SRVLOC */
-#ifdef HAVE_ACLS
+
+#ifdef HAVE_LDAP
#include <atalk/ldapconfig.h>
#endif
}
free(p);
}
+
+ /* the master loaded the volumes for zeroconf, get rid of that */
+ unload_volumes_and_extmap();
}
#ifdef USE_SRVLOC
}
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);
}
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)
{
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 */
-
/* AFPConfigInit can return two linked configs due to DSI and ASP */
if (!first) {
if ((first = AFPConfigInit(&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);
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;