X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fmain.c;h=85b5147fceaea4e52f35930130ca21d605179335;hb=dcbfd39d8a7df800a55ab0160d890bd61ebc7302;hp=7f273c23abdd84f769f0579c452bff565ba57b5f;hpb=79e77d4fe3ff1572e987ec63d9d78675de1a99be;p=netatalk.git diff --git a/etc/afpd/main.c b/etc/afpd/main.c index 7f273c23..85b5147f 100644 --- a/etc/afpd/main.c +++ b/etc/afpd/main.c @@ -1,46 +1,55 @@ /* + * $Id: main.c,v 1.26 2009-10-14 02:24:05 didg Exp $ + * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. */ #ifdef HAVE_CONFIG_H #include "config.h" -#endif +#endif /* HAVE_CONFIG_H */ #include #include #include -#include -#include #include -#include -#include #include #include -#include +#include #include #include #include -#include +#include + #include #include #include #include #include #include -#include #include #include #include +#include #include "globals.h" #include "afp_config.h" #include "status.h" #include "fork.h" #include "uam_auth.h" +#include "afp_zeroconf.h" + +#ifdef TRU64 +#include +#include +#include + +static int argc = 0; +static char **argv = NULL; +#endif /* TRU64 */ unsigned char nologin = 0; @@ -48,132 +57,190 @@ struct afp_options default_options; static AFPConfig *configs; static server_child *server_children; static fd_set save_rfds; +static int Ipc_fd = -1; +static sig_atomic_t reloadconfig = 0; -#ifdef CAPDIR -int addr_net, addr_node, addr_uid; -char addr_name[32]; -#endif CAPDIR +#ifdef TRU64 +void afp_get_cmdline( int *ac, char ***av) +{ + *ac = argc; + *av = argv; +} +#endif /* TRU64 */ static void afp_exit(const int i) { - server_unlock(default_options.pidfile); - exit(i); + server_unlock(default_options.pidfile); + exit(i); } +/* ------------------ + initialize fd set we are waiting for. +*/ +static void set_fd(int ipc_fd) +{ + AFPConfig *config; + + FD_ZERO(&save_rfds); + for (config = configs; config; config = config->next) { + if (config->fd < 0) /* for proxies */ + continue; + FD_SET(config->fd, &save_rfds); + } + if (ipc_fd >= 0) { + FD_SET(ipc_fd, &save_rfds); + } +} + +/* ------------------ */ static void afp_goaway(int sig) { + #ifndef NO_DDP asp_kill(sig); -#endif +#endif /* ! NO_DDP */ + dsi_kill(sig); switch( sig ) { + case SIGTERM : - syslog( LOG_INFO, "shutting down on signal %d", sig ); - break; + LOG(log_info, logtype_afpd, "shutting down on signal %d", sig ); + AFPConfig *config; + for (config = configs; config; config = config->next) + if (config->server_cleanup) + config->server_cleanup(config); + afp_exit(0); + break; + + case SIGUSR1 : + nologin++; + auth_unload(); + LOG(log_info, logtype_afpd, "disallowing logins"); + break; + case SIGHUP : - /* w/ a configuration file, we can force a re-read if we want */ - nologin++; - if ((nologin + 1) & 1) { - AFPConfig *config; - - syslog(LOG_INFO, "re-reading configuration file"); - for (config = configs; config; config = config->next) - if (config->server_cleanup) - config->server_cleanup(config); - - configfree(configs, NULL); - if (!(configs = configinit(&default_options))) { - syslog(LOG_ERR, "config re-read: no servers configured"); - afp_exit(1); - } - FD_ZERO(&save_rfds); - for (config = configs; config; config = config->next) { - if (config->fd < 0) - continue; - FD_SET(config->fd, &save_rfds); - } - } else { - syslog(LOG_INFO, "disallowing logins"); - auth_unload(); - } - break; + /* w/ a configuration file, we can force a re-read if we want */ + reloadconfig = 1; + break; + default : - syslog( LOG_ERR, "afp_goaway: bad signal" ); - } - if ( sig == SIGTERM ) { - AFPConfig *config; - - for (config = configs; config; config = config->next) - if (config->server_cleanup) - config->server_cleanup(config); - - afp_exit(0); + LOG(log_error, logtype_afpd, "afp_goaway: bad signal" ); } return; } -static void child_handler() +static void child_handler(int sig _U_) { - server_child_handler(server_children); + server_child_handler(server_children); } -int main( ac, av ) - int ac; - char **av; +int main(int ac, char **av) { AFPConfig *config; fd_set rfds; + void *ipc; struct sigaction sv; sigset_t sigs; + int ret; - umask( 0 ); /* so inherited file permissions work right */ +#ifdef TRU64 + argc = ac; + argv = av; + set_auth_parameters( ac, av ); +#endif /* TRU64 */ +#ifdef DEBUG1 + fault_setup(NULL); +#endif afp_options_init(&default_options); if (!afp_options_parse(ac, av, &default_options)) - exit(1); - - switch(server_lock("afpd", default_options.pidfile, - default_options.flags & OPTION_DEBUG)) { + exit(EXITERR_CONF); + + /* Save the user's current umask for use with CNID (and maybe some + * other things, too). */ + default_options.save_mask = umask( default_options.umask ); + + switch(server_lock("afpd", default_options.pidfile, + default_options.flags & OPTION_DEBUG)) { case -1: /* error */ - exit(1); + exit(EXITERR_SYS); case 0: /* child */ - break; + break; default: /* server */ - exit(0); + exit(0); } /* install child handler for asp and dsi. we do this before afp_goaway * as afp_goaway references stuff from here. * XXX: this should really be setup after the initial connections. */ if (!(server_children = server_child_alloc(default_options.connections, - CHILD_NFORKS))) { - syslog(LOG_ERR, "main: server_child alloc: %m"); - afp_exit(1); + CHILD_NFORKS))) { + LOG(log_error, logtype_afpd, "main: server_child alloc: %s", strerror(errno) ); + afp_exit(EXITERR_SYS); + } + + memset(&sv, 0, sizeof(sv)); +#ifdef AFP3x + /* linux at least up to 2.4.22 send a SIGXFZ for vfat fs, + even if the file is open with O_LARGEFILE ! */ +#ifdef SIGXFSZ + sv.sa_handler = SIG_IGN; + sigemptyset( &sv.sa_mask ); + if (sigaction(SIGXFSZ, &sv, NULL ) < 0 ) { + LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) ); + afp_exit(EXITERR_SYS); } - - memset(&sv, 0, sizeof(sv)); +#endif +#endif + sv.sa_handler = child_handler; sigemptyset( &sv.sa_mask ); + sigaddset(&sv.sa_mask, SIGALRM); + sigaddset(&sv.sa_mask, SIGHUP); + sigaddset(&sv.sa_mask, SIGTERM); + sigaddset(&sv.sa_mask, SIGUSR1); + sv.sa_flags = SA_RESTART; - if ( sigaction( SIGCHLD, &sv, 0 ) < 0 ) { - syslog( LOG_ERR, "main: sigaction: %m" ); - afp_exit(1); + if ( sigaction( SIGCHLD, &sv, NULL ) < 0 ) { + LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) ); + afp_exit(EXITERR_SYS); } sv.sa_handler = afp_goaway; sigemptyset( &sv.sa_mask ); + sigaddset(&sv.sa_mask, SIGALRM); + sigaddset(&sv.sa_mask, SIGTERM); sigaddset(&sv.sa_mask, SIGHUP); + sigaddset(&sv.sa_mask, SIGCHLD); + sv.sa_flags = SA_RESTART; + if ( sigaction( SIGUSR1, &sv, NULL ) < 0 ) { + LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) ); + afp_exit(EXITERR_SYS); + } + + sigemptyset( &sv.sa_mask ); + sigaddset(&sv.sa_mask, SIGALRM); sigaddset(&sv.sa_mask, SIGTERM); + sigaddset(&sv.sa_mask, SIGUSR1); + sigaddset(&sv.sa_mask, SIGCHLD); sv.sa_flags = SA_RESTART; - if ( sigaction( SIGHUP, &sv, 0 ) < 0 ) { - syslog( LOG_ERR, "main: sigaction: %m" ); - afp_exit(1); + if ( sigaction( SIGHUP, &sv, NULL ) < 0 ) { + LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) ); + afp_exit(EXITERR_SYS); } - if ( sigaction( SIGTERM, &sv, 0 ) < 0 ) { - syslog( LOG_ERR, "main: sigaction: %m" ); - afp_exit(1); + + + sigemptyset( &sv.sa_mask ); + sigaddset(&sv.sa_mask, SIGALRM); + sigaddset(&sv.sa_mask, SIGHUP); + sigaddset(&sv.sa_mask, SIGUSR1); + sigaddset(&sv.sa_mask, SIGCHLD); + sv.sa_flags = SA_RESTART; + if ( sigaction( SIGTERM, &sv, NULL ) < 0 ) { + LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) ); + afp_exit(EXITERR_SYS); } - + /* afpd.conf: not in config file: lockfile, connections, configfile * preference: command-line provides defaults. * config file over-writes defaults. @@ -183,23 +250,31 @@ int main( ac, av ) */ sigemptyset(&sigs); + sigaddset(&sigs, SIGALRM); sigaddset(&sigs, SIGHUP); + sigaddset(&sigs, SIGUSR1); +#if 0 + /* don't block SIGTERM */ sigaddset(&sigs, SIGTERM); - sigprocmask(SIG_BLOCK, &sigs, NULL); +#endif + sigaddset(&sigs, SIGCHLD); + + pthread_sigmask(SIG_BLOCK, &sigs, NULL); if (!(configs = configinit(&default_options))) { - syslog(LOG_ERR, "main: no servers configured: %m\n"); - afp_exit(1); + LOG(log_error, logtype_afpd, "main: no servers configured"); + afp_exit(EXITERR_CONF); } - sigprocmask(SIG_UNBLOCK, &sigs, NULL); + pthread_sigmask(SIG_UNBLOCK, &sigs, NULL); - /* watch atp and dsi sockets. */ - FD_ZERO(&save_rfds); - for (config = configs; config; config = config->next) { - if (config->fd < 0) /* for proxies */ - continue; - FD_SET(config->fd, &save_rfds); + /* Register CNID */ + cnid_init(); + + /* watch atp, dsi sockets and ipc parent/child file descriptor. */ + if ((ipc = server_ipc_create())) { + Ipc_fd = server_ipc_parent(ipc); } - + set_fd(Ipc_fd); + /* wait for an appleshare connection. parent remains in the loop * while the children get handled by afp_over_{asp,dsi}. this is * currently vulnerable to a denial-of-service attack if a @@ -207,20 +282,51 @@ int main( ac, av ) * afterwards. establishing timeouts for logins is a possible * solution. */ while (1) { - rfds = save_rfds; - if (select(FD_SETSIZE, &rfds, NULL, NULL, NULL) < 0) { - if (errno == EINTR) - continue; - syslog(LOG_ERR, "main: can't wait for input: %m"); - break; - } - - for (config = configs; config; config = config->next) { - if (config->fd < 0) - continue; - if (FD_ISSET(config->fd, &rfds)) - config->server_start(config, configs, server_children); - } + rfds = save_rfds; + pthread_sigmask(SIG_UNBLOCK, &sigs, NULL); + ret = select(FD_SETSIZE, &rfds, NULL, NULL, NULL); + pthread_sigmask(SIG_BLOCK, &sigs, NULL); + int saveerrno = errno; + + if (reloadconfig) { + nologin++; + auth_unload(); + AFPConfig *config; + + LOG(log_info, logtype_afpd, "re-reading configuration file"); + for (config = configs; config; config = config->next) + if (config->server_cleanup) + config->server_cleanup(config); + + /* configfree close atp socket used for DDP tickle, there's an issue + * with atp tid. */ + configfree(configs, NULL); + if (!(configs = configinit(&default_options))) { + LOG(log_error, logtype_afpd, "config re-read: no servers configured"); + afp_exit(EXITERR_CONF); + } + set_fd(Ipc_fd); + nologin = 0; + reloadconfig = 0; + errno = saveerrno; + } + + if (ret < 0) { + if (errno == EINTR) + continue; + LOG(log_error, logtype_afpd, "main: can't wait for input: %s", strerror(errno)); + break; + } + if (Ipc_fd >=0 && FD_ISSET(Ipc_fd, &rfds)) { + server_ipc_read(server_children); + } + for (config = configs; config; config = config->next) { + if (config->fd < 0) + continue; + if (FD_ISSET(config->fd, &rfds)) { + config->server_start(config, configs, server_children); + } + } } return 0;