/*
- * $Id: afp_config.c,v 1.29 2009-11-05 14:38:07 franklahm Exp $
- *
* Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
* All Rights Reserved. See COPYRIGHT.
*/
#ifdef USE_SRVLOC
#include <slp.h>
#endif /* USE_SRVLOC */
-#ifdef HAVE_NFSv4_ACLS
+#ifdef HAVE_ACLS
#include <atalk/ldapconfig.h>
#endif
#include "afp_config.h"
#include "uam_auth.h"
#include "status.h"
+#include "volume.h"
+#include "afp_zeroconf.h"
#define LINESIZE 1024
}
free(p);
}
+
+ /* the master loaded the volumes for zeroconf, get rid of that */
+ unload_volumes_and_extmap();
}
#ifdef USE_SRVLOC
}
#endif /* USE_SRVLOC */
-#ifdef USE_SRVLOC
static void dsi_cleanup(const AFPConfig *config)
{
+#ifdef USE_SRVLOC
SLPError err;
SLPError callbackerr;
SLPHandle hslp;
srvloc_dereg_err:
dsi->srvloc_url[0] = '\0';
SLPClose(hslp);
-}
#endif /* USE_SRVLOC */
+}
#ifndef NO_DDP
static void asp_cleanup(const AFPConfig *config)
AFPConfig *config;
DSI *dsi;
char *p, *q;
-#ifdef USE_SRVLOC
- SLPError err;
- SLPError callbackerr;
- SLPHandle hslp;
- struct servent *afpovertcp;
- int afp_port = 548;
- char *srvloc_hostname, *hostname;
-#endif /* USE_SRVLOC */
if ((config = (AFPConfig *) calloc(1, sizeof(AFPConfig))) == NULL) {
LOG(log_error, logtype_afpd, "DSIConfigInit: malloc(config): %s", strerror(errno) );
#ifdef USE_SRVLOC
dsi->srvloc_url[0] = '\0'; /* Mark that we haven't registered. */
if (!(options->flags & OPTION_NOSLP)) {
+ SLPError err;
+ SLPError callbackerr;
+ SLPHandle hslp;
+ unsigned int afp_port;
+ int l;
+ char *srvloc_hostname;
+ const char *hostname;
+
err = SLPOpen("en", SLP_FALSE, &hslp);
if (err != SLP_OK) {
LOG(log_error, logtype_afpd, "DSIConfigInit: Error opening SRVLOC handle");
* use a non-default port, they can, but be aware, this server might
* not show up int the Network Browser.
*/
- afpovertcp = getservbyname("afpovertcp", "tcp");
- if (afpovertcp != NULL) {
- afp_port = afpovertcp->s_port;
- }
+ 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) {
p = strchr(hostname, ':');
}
else
- hostname = inet_ntoa(dsi->server.sin_addr);
+ hostname = getip_string((struct sockaddr *)&dsi->server);
+
srvloc_hostname = srvloc_encode(options, (options->server ? options->server : options->hostname));
- if (strlen(srvloc_hostname) > (sizeof(dsi->srvloc_url) - strlen(hostname) - 21)) {
+ if ((p) || afp_port == 548) {
+ l = snprintf(dsi->srvloc_url, sizeof(dsi->srvloc_url), "afp://%s/?NAME=%s", hostname, srvloc_hostname);
+ }
+ else {
+ l = snprintf(dsi->srvloc_url, sizeof(dsi->srvloc_url), "afp://%s:%d/?NAME=%s", hostname, afp_port, srvloc_hostname);
+ }
+
+ if (l == -1 || l >= (int)sizeof(dsi->srvloc_url)) {
LOG(log_error, logtype_afpd, "DSIConfigInit: Hostname is too long for SRVLOC");
dsi->srvloc_url[0] = '\0';
goto srvloc_reg_err;
}
- if ((p) || dsi->server.sin_port == afp_port) {
- sprintf(dsi->srvloc_url, "afp://%s/?NAME=%s", hostname, srvloc_hostname);
- }
- else {
- sprintf(dsi->srvloc_url, "afp://%s:%d/?NAME=%s", hostname, ntohs(dsi->server.sin_port), srvloc_hostname);
- }
err = SLPReg(hslp,
dsi->srvloc_url,
}
LOG(log_info, logtype_afpd, "Sucessfully registered %s with SRVLOC", dsi->srvloc_url);
+ config->server_cleanup = dsi_cleanup;
srvloc_reg_err:
SLPClose(hslp);
}
#endif /* USE_SRVLOC */
-
config->fd = dsi->serversock;
config->obj.handle = dsi;
config->obj.config = config;
(*refcount)++;
config->server_start = dsi_start;
-#ifdef USE_SRVLOC
- config->server_cleanup = dsi_cleanup;
-#endif
return config;
}
/* 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;
config->defoptions = defoptions;
#endif /* NO_DDP */
+
+ /* set signature */
+ set_signature(options);
+
/* handle dsi transports and dsi proxies. we only proxy
* for DSI connections. */
struct afp_options options;
AFPConfig *config=NULL, *first = NULL;
-#ifdef HAVE_NFSv4_ACLS
- /* Parse ldap.conf first so we can set the uuid option */
- LOG(log_debug, logtype_afpd, "Start parsing ldap.conf");
+#ifdef HAVE_ACLS
+ /* Parse afp_ldap.conf first so we can set the uuid option */
acl_ldap_readconfig(_PATH_ACL_LDAPCONF);
- LOG(log_debug, logtype_afpd, "Finished parsing ldap.conf");
-#endif
+#endif /* HAVE_ACLS */
- status_reset();
/* if config file doesn't exist, load defaults */
if ((fp = fopen(cmdline->configfile, "r")) == NULL)
{
return AFPConfigInit(cmdline, cmdline);
}
- LOG(log_debug, logtype_afpd, "Loading ConfigFile");
-
/* scan in the configuration file */
len = 0;
while (!feof(fp)) {
if (!afp_options_parseline(p, &options))
continue;
-#ifdef HAVE_NFSv4_ACLS
+#ifdef HAVE_ACLS
/* Enable UUID support if LDAP config is complete */
- if (ldap_config_valid)
- options.flags |= OPTION_UUID;
-#endif
+ 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;
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;
}
projects / netatalk.git / blobdiff