X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=etc%2Fafpd%2Fafp_config.c;h=8c8ac012ad964c79e441d9463869bc4fe096203f;hb=75fe310224dffb96868d7f2cb1ec9125a84f2a08;hp=6842f54bfdf3843e93de9a444b80186a1fc95983;hpb=23f887d0168697eae11d1674804581ca12e3809c;p=netatalk.git diff --git a/etc/afpd/afp_config.c b/etc/afpd/afp_config.c index 6842f54b..8c8ac012 100644 --- a/etc/afpd/afp_config.c +++ b/etc/afpd/afp_config.c @@ -1,5 +1,5 @@ /* - * $Id: afp_config.c,v 1.20 2002-05-03 22:51:33 jmarcus Exp $ + * $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. @@ -34,6 +34,7 @@ char *strchr (), *strrchr (); #endif /* HAVE_UNISTD_H */ #include #include +#include #include #include @@ -48,8 +49,10 @@ char *strchr (), *strrchr (); #include #ifdef USE_SRVLOC #include -static char srvloc_url[512]; #endif /* USE_SRVLOC */ +#ifdef HAVE_NFSv4_ACLS +#include +#endif #include "globals.h" #include "afp_config.h" @@ -96,9 +99,62 @@ void configfree(AFPConfig *configs, const AFPConfig *config) } #ifdef USE_SRVLOC -static void SRVLOC_callback(SLPHandle hslp, SLPError errcode, void *cookie) { +static void SRVLOC_callback(SLPHandle hslp _U_, SLPError errcode, void *cookie) { *(SLPError*)cookie = errcode; } + +static char hex[17] = "0123456789abcdef"; + +static char * srvloc_encode(const struct afp_options *options, const char *name) +{ + static char buf[512]; + char *conv_name; + unsigned char *p; + unsigned int i = 0; +#ifndef NO_DDP + char *Obj, *Type = "", *Zone = ""; +#endif + + /* Convert name to maccharset */ + if ((size_t)-1 ==(convert_string_allocate( options->unixcharset, options->maccharset, + name, -1, &conv_name)) ) + return (char*)name; + + /* Escape characters */ + p = conv_name; + while (*p && i<(sizeof(buf)-4)) { + if (*p == '@') + break; + else if (isspace(*p)) { + buf[i++] = '%'; + buf[i++] = '2'; + buf[i++] = '0'; + p++; + } + else if ((!isascii(*p)) || *p <= 0x2f || *p == 0x3f ) { + buf[i++] = '%'; + buf[i++] = hex[*p >> 4]; + buf[i++] = hex[*p++ & 15]; + } + else { + buf[i++] = *p++; + } + } + buf[i] = '\0'; + +#ifndef NO_DDP + /* Add ZONE, */ + if (nbp_name(options->server, &Obj, &Type, &Zone )) { + LOG(log_error, logtype_afpd, "srvloc_encode: can't parse %s", options->server ); + } + else { + snprintf( buf+i, sizeof(buf)-i-1 ,"&ZONE=%s", Zone); + } +#endif + free (conv_name); + + return buf; +} #endif /* USE_SRVLOC */ #ifdef USE_SRVLOC @@ -107,9 +163,10 @@ static void dsi_cleanup(const AFPConfig *config) SLPError err; SLPError callbackerr; SLPHandle hslp; + DSI *dsi = (DSI *)config->obj.handle; /* Do nothing if we didn't register. */ - if (srvloc_url[0] == '\0') + if (!dsi || dsi->srvloc_url[0] == '\0') return; err = SLPOpen("en", SLP_FALSE, &hslp); @@ -119,20 +176,21 @@ static void dsi_cleanup(const AFPConfig *config) } err = SLPDereg(hslp, - srvloc_url, + dsi->srvloc_url, SRVLOC_callback, &callbackerr); if (err != SLP_OK) { - LOG(log_error, logtype_afpd, "dsi_cleanup: Error unregistering %s from SRVLOC", srvloc_url); + LOG(log_error, logtype_afpd, "dsi_cleanup: Error unregistering %s from SRVLOC", dsi->srvloc_url); goto srvloc_dereg_err; } if (callbackerr != SLP_OK) { - LOG(log_error, logtype_afpd, "dsi_cleanup: Error in callback while trying to unregister %s from SRVLOC (%d)", srvloc_url, callbackerr); + LOG(log_error, logtype_afpd, "dsi_cleanup: Error in callback while trying to unregister %s from SRVLOC (%d)", dsi->srvloc_url, callbackerr); goto srvloc_dereg_err; } srvloc_dereg_err: + dsi->srvloc_url[0] = '\0'; SLPClose(hslp); } #endif /* USE_SRVLOC */ @@ -140,6 +198,8 @@ srvloc_dereg_err: #ifndef NO_DDP static void asp_cleanup(const AFPConfig *config) { + /* we need to stop tickle handler */ + asp_stop_tickle(); nbp_unrgstr(config->obj.Obj, config->obj.Type, config->obj.Zone, &config->obj.options.ddpaddr); } @@ -154,7 +214,7 @@ static int asp_start(AFPConfig *config, AFPConfig *configs, if (!(asp = asp_getsession(config->obj.handle, server_children, config->obj.options.tickleval))) { LOG(log_error, logtype_afpd, "main: asp_getsession: %s", strerror(errno) ); - exit( 1 ); + exit( EXITERR_CLNT ); } if (asp->child) { @@ -175,7 +235,7 @@ static int dsi_start(AFPConfig *config, AFPConfig *configs, if (!(dsi = dsi_getsession(config->obj.handle, server_children, config->obj.options.tickleval))) { LOG(log_error, logtype_afpd, "main: dsi_getsession: %s", strerror(errno) ); - exit( 1 ); + exit( EXITERR_CLNT ); } /* we've forked. */ @@ -196,6 +256,7 @@ static AFPConfig *ASPConfigInit(const struct afp_options *options, ATP atp; ASP asp; char *Obj, *Type = "AFPServer", *Zone = "*"; + char *convname = NULL; if ((config = (AFPConfig *) calloc(1, sizeof(AFPConfig))) == NULL) return NULL; @@ -215,10 +276,20 @@ static AFPConfig *ASPConfigInit(const struct afp_options *options, /* register asp server */ Obj = (char *) options->hostname; - if (nbp_name(options->server, &Obj, &Type, &Zone )) { + if (options->server && (size_t)-1 ==(convert_string_allocate( options->unixcharset, options->maccharset, + options->server, strlen(options->server), &convname)) ) { + if ((convname = strdup(options->server)) == NULL ) { + LOG(log_error, logtype_afpd, "malloc: %s", strerror(errno) ); + goto serv_free_return; + } + } + + if (nbp_name(convname, &Obj, &Type, &Zone )) { LOG(log_error, logtype_afpd, "main: can't parse %s", options->server ); goto serv_free_return; } + if (convname) + free (convname); /* dup Obj, Type and Zone as they get assigned to a single internal * buffer by nbp_name */ @@ -286,7 +357,7 @@ static AFPConfig *DSIConfigInit(const struct afp_options *options, SLPHandle hslp; struct servent *afpovertcp; int afp_port = 548; - char *srvloc_hostname; + char *srvloc_hostname, *hostname; #endif /* USE_SRVLOC */ if ((config = (AFPConfig *) calloc(1, sizeof(AFPConfig))) == NULL) { @@ -294,6 +365,11 @@ static AFPConfig *DSIConfigInit(const struct afp_options *options, 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, @@ -304,17 +380,15 @@ static AFPConfig *DSIConfigInit(const struct afp_options *options, } 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 - srvloc_url[0] = '\0'; /* Mark that we haven't registered. */ + dsi->srvloc_url[0] = '\0'; /* Mark that we haven't registered. */ if (!(options->flags & OPTION_NOSLP)) { err = SLPOpen("en", SLP_FALSE, &hslp); if (err != SLP_OK) { @@ -329,43 +403,52 @@ static AFPConfig *DSIConfigInit(const struct afp_options *options, * not show up int the Network Browser. */ afpovertcp = getservbyname("afpovertcp", "tcp"); - srvloc_hostname = (options->server ? options->server : options->hostname); if (afpovertcp != NULL) { afp_port = afpovertcp->s_port; } - if (strlen(srvloc_hostname) > (sizeof(srvloc_url) - strlen(inet_ntoa(dsi->server.sin_addr)) - 21)) { + /* 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 = inet_ntoa(dsi->server.sin_addr); + srvloc_hostname = srvloc_encode(options, (options->server ? options->server : options->hostname)); + + if (strlen(srvloc_hostname) > (sizeof(dsi->srvloc_url) - strlen(hostname) - 21)) { LOG(log_error, logtype_afpd, "DSIConfigInit: Hostname is too long for SRVLOC"); - srvloc_url[0] = '\0'; + dsi->srvloc_url[0] = '\0'; goto srvloc_reg_err; } - if (dsi->server.sin_port == afp_port) { - sprintf(srvloc_url, "afp://%s/?NAME=%s", inet_ntoa(dsi->server.sin_addr), srvloc_hostname); + if ((p) || dsi->server.sin_port == afp_port) { + sprintf(dsi->srvloc_url, "afp://%s/?NAME=%s", hostname, srvloc_hostname); } else { - sprintf(srvloc_url, "afp://%s:%d/?NAME=%s", inet_ntoa(dsi->server.sin_addr), ntohs(dsi->server.sin_port), srvloc_hostname); + sprintf(dsi->srvloc_url, "afp://%s:%d/?NAME=%s", hostname, ntohs(dsi->server.sin_port), srvloc_hostname); } err = SLPReg(hslp, - srvloc_url, + dsi->srvloc_url, SLP_LIFETIME_MAXIMUM, - "", + "afp", "", SLP_TRUE, SRVLOC_callback, &callbackerr); if (err != SLP_OK) { - LOG(log_error, logtype_afpd, "DSIConfigInit: Error registering %s with SRVLOC", srvloc_url); - srvloc_url[0] = '\0'; + LOG(log_error, logtype_afpd, "DSIConfigInit: Error registering %s with SRVLOC", dsi->srvloc_url); + dsi->srvloc_url[0] = '\0'; goto srvloc_reg_err; } if (callbackerr != SLP_OK) { - LOG(log_error, logtype_afpd, "DSIConfigInit: Error in callback trying to register %s with SRVLOC", srvloc_url); - srvloc_url[0] = '\0'; + LOG(log_error, logtype_afpd, "DSIConfigInit: Error in callback trying to register %s with SRVLOC", dsi->srvloc_url); + dsi->srvloc_url[0] = '\0'; goto srvloc_reg_err; } - LOG(log_info, logtype_afpd, "Sucessfully registered %s with SRVLOC", srvloc_url); + LOG(log_info, logtype_afpd, "Sucessfully registered %s with SRVLOC", dsi->srvloc_url); srvloc_reg_err: SLPClose(hslp); @@ -391,7 +474,7 @@ srvloc_reg_err: config->server_start = dsi_start; #ifdef USE_SRVLOC config->server_cleanup = dsi_cleanup; -#endif /* USE_SRVLOC */ +#endif return config; } @@ -457,9 +540,18 @@ AFPConfig *configinit(struct afp_options *cmdline) { FILE *fp; char buf[LINESIZE + 1], *p, have_option = 0; + size_t len; struct afp_options options; - AFPConfig *config, *first = NULL; + 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) { @@ -471,9 +563,16 @@ AFPConfig *configinit(struct afp_options *cmdline) LOG(log_debug, logtype_afpd, "Loading ConfigFile"); /* scan in the configuration file */ + len = 0; while (!feof(fp)) { - if (!fgets(buf, sizeof(buf), fp) || buf[0] == '#') + if (!fgets(&buf[len], LINESIZE - len, fp) || buf[len] == '#') continue; + len = strlen(buf); + if ( len >= 2 && buf[len-2] == '\\' ) { + len -= 2; + continue; + } else + len = 0; /* a little pre-processing to get rid of spaces and end-of-lines */ p = buf; @@ -488,6 +587,12 @@ AFPConfig *configinit(struct afp_options *cmdline) 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))) @@ -501,7 +606,7 @@ AFPConfig *configinit(struct afp_options *cmdline) fclose(fp); if (!have_option) - return AFPConfigInit(cmdline, cmdline); + first = AFPConfigInit(cmdline, cmdline); return first; }