/*
- * $Id: main.c,v 1.10 2001-06-25 15:18:01 rufustfirefly Exp $
+ * $Id: main.c,v 1.20 2002-10-04 15:15:05 srittau Exp $
*
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
#include <sys/stat.h>
#include <sys/param.h>
#include <sys/uio.h>
-#include <sys/syslog.h>
+#include <atalk/logger.h>
#include <sys/time.h>
#include <sys/socket.h>
static char **argv = NULL;
#endif /* TRU64 */
-#ifdef DID_MTAB
-#include "parse_mtab.h"
-#endif /* DID_MTAB */
-
unsigned char nologin = 0;
struct afp_options default_options;
#ifdef TRU64
void afp_get_cmdline( int *ac, char ***av)
{
- *ac = argc;
- *av = argv;
+ *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);
}
static void afp_goaway(int sig)
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 );
+ 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 */
+ nologin++;
+ if ((nologin + 1) & 1) {
+ 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(configs, NULL);
+ if (!(configs = configinit(&default_options))) {
+ LOG(log_error, logtype_afpd, "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 {
+ LOG(log_info, logtype_afpd, "disallowing logins");
+ auth_unload();
+ }
+ break;
default :
- syslog( LOG_ERR, "afp_goaway: bad signal" );
+ LOG(log_error, logtype_afpd, "afp_goaway: bad signal" );
}
if ( sig == SIGTERM ) {
- AFPConfig *config;
-
- for (config = configs; config; config = config->next)
- if (config->server_cleanup)
- config->server_cleanup(config);
+ AFPConfig *config;
+
+ for (config = configs; config; config = config->next)
+ if (config->server_cleanup)
+ config->server_cleanup(config);
- afp_exit(0);
+ afp_exit(0);
}
return;
}
static void child_handler()
{
- server_child_handler(server_children);
+ server_child_handler(server_children);
}
int main( ac, av )
- int ac;
- char **av;
+int ac;
+char **av;
{
AFPConfig *config;
fd_set rfds;
set_auth_parameters( ac, av );
#endif /* TRU64 */
- umask( 0 ); /* so inherited file permissions work right */
-
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(1);
+
+ /* 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(1);
case 0: /* child */
- break;
+ break;
default: /* server */
- exit(0);
+ exit(0);
}
-#ifdef DID_MTAB
- /* if we are going to use afpd.mtab, load the file */
- afpd_mount_table = afpd_mtab_parse ( AFPD_MTAB_FILE );
-#endif /* DID_MTAB */
-
/* 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(1);
}
-
+
memset(&sv, 0, sizeof(sv));
sv.sa_handler = child_handler;
sigemptyset( &sv.sa_mask );
sv.sa_flags = SA_RESTART;
if ( sigaction( SIGCHLD, &sv, 0 ) < 0 ) {
- syslog( LOG_ERR, "main: sigaction: %m" );
- afp_exit(1);
+ LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) );
+ afp_exit(1);
}
sv.sa_handler = afp_goaway;
sigaddset(&sv.sa_mask, SIGTERM);
sv.sa_flags = SA_RESTART;
if ( sigaction( SIGHUP, &sv, 0 ) < 0 ) {
- syslog( LOG_ERR, "main: sigaction: %m" );
- afp_exit(1);
+ LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) );
+ afp_exit(1);
}
if ( sigaction( SIGTERM, &sv, 0 ) < 0 ) {
- syslog( LOG_ERR, "main: sigaction: %m" );
- afp_exit(1);
+ LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) );
+ afp_exit(1);
}
-
+
/* afpd.conf: not in config file: lockfile, connections, configfile
* preference: command-line provides defaults.
* config file over-writes defaults.
sigaddset(&sigs, SIGTERM);
sigprocmask(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: %s\n", strerror(errno));
+ afp_exit(1);
}
sigprocmask(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);
+ if (config->fd < 0) /* for proxies */
+ continue;
+ FD_SET(config->fd, &save_rfds);
}
-
+
/* 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
* 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;
+ if (select(FD_SETSIZE, &rfds, NULL, NULL, NULL) < 0) {
+ if (errno == EINTR)
+ continue;
+ LOG(log_error, logtype_afpd, "main: can't wait for input: %s", strerror(errno));
+ 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);
+ }
}
return 0;
projects / netatalk.git / blobdiff