X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fafp_config.c;h=8c997ebe94f7999e0e51b248a304e95fd38997da;hb=6d60f95c388da5f8f901d67e0018cf4896e6c6dc;hp=12ebe3c00880fa63b70fc82b4bb6af47a520cdbd;hpb=0516198f04fb0531eff26054aac02250d9d140db;p=netatalk.git diff --git a/etc/afpd/afp_config.c b/etc/afpd/afp_config.c index 12ebe3c0..8c997ebe 100644 --- a/etc/afpd/afp_config.c +++ b/etc/afpd/afp_config.c @@ -11,44 +11,25 @@ #include #include #include - -/* STDC check */ -#if STDC_HEADERS #include -#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 -#endif /* HAVE_UNISTD_H */ #include -#include -#include - #include #include #include +#ifdef USE_SRVLOC +#include +#endif /* USE_SRVLOC */ + +#include +#include #include -#include -#include -#include #include #include #include -#ifdef USE_SRVLOC -#include -#endif /* USE_SRVLOC */ -#ifdef HAVE_ACLS + +#ifdef HAVE_LDAP #include #endif @@ -56,6 +37,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 @@ -78,15 +61,6 @@ void configfree(AFPConfig *configs, const AFPConfig *config) } switch (p->obj.proto) { -#ifndef NO_DDP - case AFPPROTO_ASP: - free(p->obj.Obj); - free(p->obj.Type); - free(p->obj.Zone); - atp_close(((ASP) p->obj.handle)->asp_atp); - free(p->obj.handle); - break; -#endif /* no afp/asp */ case AFPPROTO_DSI: close(p->fd); free(p->obj.handle); @@ -94,6 +68,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 @@ -109,9 +86,6 @@ static char * srvloc_encode(const struct afp_options *options, const char *name) 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, @@ -140,24 +114,15 @@ static char * srvloc_encode(const struct afp_options *options, const char *name) } 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 static void dsi_cleanup(const AFPConfig *config) { +#ifdef USE_SRVLOC SLPError err; SLPError callbackerr; SLPHandle hslp; @@ -190,157 +155,34 @@ static void dsi_cleanup(const AFPConfig *config) srvloc_dereg_err: dsi->srvloc_url[0] = '\0'; SLPClose(hslp); -} #endif /* USE_SRVLOC */ - -#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); -} - -/* these two are almost identical. it should be possible to collapse them - * into one with minimal junk. */ -static int asp_start(AFPConfig *config, AFPConfig *configs, - server_child *server_children) -{ - ASP asp; - - 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( EXITERR_CLNT ); - } - - if (asp->child) { - configfree(configs, config); /* free a bunch of stuff */ - afp_over_asp(&config->obj); - exit (0); - } - - return 0; } -#endif /* no afp/asp */ -static int dsi_start(AFPConfig *config, AFPConfig *configs, - server_child *server_children) +static afp_child_t *dsi_start(AFPConfig *config, AFPConfig *configs, + server_child *server_children) { - DSI *dsi; + DSI *dsi = config->obj.handle; + afp_child_t *child = NULL; - 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( EXITERR_CLNT ); + if (!(child = dsi_getsession(dsi, + server_children, + config->obj.options.tickleval))) { + LOG(log_error, logtype_afpd, "dsi_start: session error: %s", strerror(errno)); + return NULL; } /* we've forked. */ - if (dsi->child) { + if (parent_or_child == 1) { configfree(configs, config); + config->obj.ipc_fd = child->ipc_fds[1]; + close(child->ipc_fds[0]); /* Close parent IPC fd */ + free(child); afp_over_dsi(&config->obj); /* start a session */ exit (0); } - return 0; -} - -#ifndef NO_DDP -static AFPConfig *ASPConfigInit(const struct afp_options *options, - unsigned char *refcount) -{ - AFPConfig *config; - ATP atp; - ASP asp; - char *Obj, *Type = "AFPServer", *Zone = "*"; - char *convname = NULL; - - if ((config = (AFPConfig *) calloc(1, sizeof(AFPConfig))) == NULL) - return NULL; - - if ((atp = atp_open(ATADDR_ANYPORT, &options->ddpaddr)) == NULL) { - LOG(log_error, logtype_afpd, "main: atp_open: %s", strerror(errno) ); - free(config); - return NULL; - } - - if ((asp = asp_init( atp )) == NULL) { - LOG(log_error, logtype_afpd, "main: asp_init: %s", strerror(errno) ); - atp_close(atp); - free(config); - return NULL; - } - - /* register asp server */ - Obj = (char *) options->hostname; - 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 */ - if ((config->obj.Obj = strdup(Obj)) == NULL) - goto serv_free_return; - - if ((config->obj.Type = strdup(Type)) == NULL) { - free(config->obj.Obj); - goto serv_free_return; - } - - if ((config->obj.Zone = strdup(Zone)) == NULL) { - free(config->obj.Obj); - free(config->obj.Type); - goto serv_free_return; - } - - /* make sure we're not registered */ - nbp_unrgstr(Obj, Type, Zone, &options->ddpaddr); - if (nbp_rgstr( atp_sockaddr( atp ), Obj, Type, Zone ) < 0 ) { - LOG(log_error, logtype_afpd, "Can't register %s:%s@%s", Obj, Type, Zone ); - free(config->obj.Obj); - free(config->obj.Type); - free(config->obj.Zone); - goto serv_free_return; - } - - LOG(log_info, logtype_afpd, "%s:%s@%s started on %u.%u:%u (%s)", Obj, Type, Zone, - ntohs( atp_sockaddr( atp )->sat_addr.s_net ), - atp_sockaddr( atp )->sat_addr.s_node, - atp_sockaddr( atp )->sat_port, VERSION ); - - config->fd = atp_fileno(atp); - config->obj.handle = asp; - config->obj.config = config; - config->obj.proto = AFPPROTO_ASP; - - memcpy(&config->obj.options, options, sizeof(struct afp_options)); - config->optcount = refcount; - (*refcount)++; - - config->server_start = asp_start; - config->server_cleanup = asp_cleanup; - - return config; - -serv_free_return: - asp_close(asp); - free(config); - return NULL; + return child; } -#endif /* no afp/asp */ - static AFPConfig *DSIConfigInit(const struct afp_options *options, unsigned char *refcount, @@ -368,12 +210,13 @@ static AFPConfig *DSIConfigInit(const struct afp_options *options, free(config); return NULL; } + dsi->dsireadbuf = options->dsireadbuf; 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); } @@ -453,7 +296,6 @@ srvloc_reg_err: } #endif /* USE_SRVLOC */ - config->fd = dsi->serversock; config->obj.handle = dsi; config->obj.config = config; @@ -476,10 +318,10 @@ 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; + AFPConfig *next = NULL; unsigned char *refcount; if ((refcount = (unsigned char *) @@ -488,14 +330,6 @@ static AFPConfig *AFPConfigInit(const struct afp_options *options, return NULL; } -#ifndef NO_DDP - /* handle asp transports */ - if ((options->transports & AFPTRANS_DDP) && - (config = ASPConfigInit(options, refcount))) - config->defoptions = defoptions; -#endif /* NO_DDP */ - - /* set signature */ set_signature(options); @@ -508,10 +342,11 @@ static AFPConfig *AFPConfigInit(const struct afp_options *options, * (next = DSIConfigInit(options, refcount, i))) * next->defoptions = defoptions; */ - if ((options->transports & AFPTRANS_TCP) && - (((options->flags & OPTION_PROXY) == 0) || - ((options->flags & OPTION_PROXY) && config)) - && (next = DSIConfigInit(options, refcount, DSI_TCPIP))) + if ( (options->transports & AFPTRANS_TCP) + && + ((options->flags & OPTION_PROXY) == 0) + && + (next = DSIConfigInit(options, refcount, DSI_TCPIP))) next->defoptions = defoptions; /* load in all the authentication modules. we can load the same @@ -523,13 +358,7 @@ static AFPConfig *AFPConfigInit(const struct afp_options *options, /* this should be able to accept multiple dsi transports. i think * the only thing that gets affected is the net addresses. */ - status_init(config, next, options); - - /* attach dsi config to tail of asp config */ - if (config) { - config->next = next; - return config; - } + status_init(next, options); return next; } @@ -543,11 +372,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) { @@ -581,15 +405,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; @@ -598,11 +414,22 @@ 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 */ + if (! (first->obj.options.flags & OPTION_NOZEROCONF)) { + load_volumes(&first->obj); + zeroconf_register(first); + } + return first; }