/*
- * $Id: afp_config.c,v 1.24 2009-01-16 18:45:26 morgana Exp $
+ * $Id: afp_config.c,v 1.30 2009-11-06 03:50:32 didg 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
+#include <atalk/ldapconfig.h>
+#endif
#include "globals.h"
#include "afp_config.h"
/* Convert name to maccharset */
if ((size_t)-1 ==(convert_string_allocate( options->unixcharset, options->maccharset,
- name, strlen(name), &conv_name)) )
+ name, -1, &conv_name)) )
return (char*)name;
/* Escape characters */
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) );
return NULL;
}
+ LOG(log_debug, logtype_afpd, "DSIConfigInit: hostname: %s, ip/port: %s/%s, ",
+ options->hostname,
+ options->ipaddr ? options->ipaddr : "default",
+ options->port ? options->port : "548");
+
if ((dsi = dsi_init(protocol, "afpd", options->hostname,
options->ipaddr, options->port,
options->flags & OPTION_PROXY,
}
if (options->flags & OPTION_PROXY) {
- LOG(log_info, logtype_afpd, "ASIP proxy initialized for %s:%d (%s)",
- inet_ntoa(dsi->server.sin_addr), ntohs(dsi->server.sin_port),
- VERSION);
+ LOG(log_info, 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, "ASIP started on %s:%d(%d) (%s)",
- inet_ntoa(dsi->server.sin_addr), ntohs(dsi->server.sin_port),
- dsi->serversock, VERSION);
+ LOG(log_info, logtype_afpd, "AFP/TCP started, advertising %s:%d (%s)",
+ getip_string((struct sockaddr *)&dsi->server), getip_port((struct sockaddr *)&dsi->server), VERSION);
}
#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);
(*refcount)++;
config->server_start = dsi_start;
-#ifdef USE_SRVLOC
- config->server_cleanup = dsi_cleanup;
-#endif
return config;
}
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");
+ acl_ldap_readconfig(_PATH_ACL_LDAPCONF);
+ LOG(log_debug, logtype_afpd, "Finished parsing ldap.conf");
+#endif
+
status_reset();
/* if config file doesn't exist, load defaults */
if ((fp = fopen(cmdline->configfile, "r")) == NULL)
if (!fgets(&buf[len], LINESIZE - len, fp) || buf[len] == '#')
continue;
len = strlen(buf);
- if ( buf[len-2] == '\\' ) {
+ if ( len >= 2 && buf[len-2] == '\\' ) {
len -= 2;
continue;
} else
if (!afp_options_parseline(p, &options))
continue;
+#ifdef HAVE_NFSv4_ACLS
+ /* Enable UUID support if LDAP config is complete */
+ if (ldap_config_valid)
+ options.flags |= OPTION_UUID;
+#endif
+
/* this should really get a head and a tail to simplify things. */
if (!first) {
if ((first = AFPConfigInit(&options, cmdline)))
fclose(fp);
if (!have_option)
- return AFPConfigInit(cmdline, cmdline);
+ first = AFPConfigInit(cmdline, cmdline);
return first;
}
projects / netatalk.git / blobdiff