X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=etc%2Fafpd%2Fafp_options.c;h=9bb48042fa1e98ffdb5033edf70173995c310740;hp=2637e1a8cf1c6fa105de3157a5d22a818b78b8d2;hb=5116ed2346ea7ee6e5a9858dee94f3eacdc00d7e;hpb=42b5e445ef6355aed8b3df9dd1c13b8bb85815b9 diff --git a/etc/afpd/afp_options.c b/etc/afpd/afp_options.c index 2637e1a8..9bb48042 100644 --- a/etc/afpd/afp_options.c +++ b/etc/afpd/afp_options.c @@ -1,6 +1,4 @@ /* - * $Id: afp_options.c,v 1.51 2009-11-24 21:01:45 didg Exp $ - * * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu) * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -14,48 +12,34 @@ #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 */ - #include -#ifdef HAVE_UNISTD_H #include -#endif /* HAVE_UNISTD_H */ #include #include #include #include #include + #ifdef HAVE_NETDB_H #include #endif /* HAVE_NETDB_H */ +#ifdef ADMIN_GRP +#include +#include +#endif /* ADMIN_GRP */ + #include #include +#include + #include "globals.h" #include "status.h" #include "auth.h" - -#include - -#ifdef ADMIN_GRP -#include -#include -#endif /* ADMIN_GRP */ +#include "dircache.h" +#include "fce_api.h" #ifndef MIN #define MIN(a, b) ((a) < (b) ? (a) : (b)) @@ -137,8 +121,8 @@ void afp_options_free(struct afp_options *opt, free(opt->uamlist); if (opt->passwdfile && (opt->passwdfile != save->passwdfile)) free(opt->passwdfile); - if (opt->signature && (opt->signature != save->signature)) - free(opt->signature); + if (opt->signatureopt && (opt->signatureopt != save->signatureopt)) + free(opt->signatureopt); if (opt->k5service && (opt->k5service != save->k5service)) free(opt->k5service); if (opt->k5realm && (opt->k5realm != save->k5realm)) @@ -154,6 +138,8 @@ void afp_options_free(struct afp_options *opt, free(opt->ntdomain); if (opt->ntseparator && (opt->ntseparator != save->ntseparator)) free(opt->ntseparator); + if (opt->logconfig && (opt->logconfig != save->logconfig)) + free(opt->logconfig); } /* initialize options */ @@ -165,6 +151,8 @@ void afp_options_init(struct afp_options *options) options->defaultvol.name = _PATH_AFPDDEFVOL; options->systemvol.name = _PATH_AFPDSYSVOL; options->configfile = _PATH_AFPDCONF; + options->sigconffile = _PATH_AFPDSIGCONF; + options->uuidconf = _PATH_AFPDUUIDCONF; options->uampath = _PATH_AFPDUAMPATH; options->uamlist = "uams_dhx.so,uams_dhx2.so"; options->guest = "nobody"; @@ -172,11 +160,12 @@ void afp_options_init(struct afp_options *options) options->transports = AFPTRANS_TCP; /* TCP only */ options->passwdfile = _PATH_AFPDPWFILE; options->tickleval = 30; - options->timeout = 4; - options->sleep = 10* 120; /* 10 h in 30 seconds tick */ + options->timeout = 4; /* 4 tickles = 2 minutes */ + options->sleep = 10 * 60 * 2; /* 10 h in 30 seconds tick */ + options->disconnected = 10 * 60 * 2; /* 10 h in 30 seconds tick */ options->server_notif = 1; options->authprintdir = NULL; - options->signature = "host"; + options->signatureopt = "auto"; options->umask = 0; #ifdef ADMIN_GRP options->admingid = 0; @@ -195,6 +184,12 @@ void afp_options_init(struct afp_options *options) /* don't advertize slp by default */ options->flags |= OPTION_NOSLP; #endif + options->dircachesize = DEFAULT_MAX_DIRCACHE_SIZE; + options->flags |= OPTION_ACL2MACCESS; + options->flags |= OPTION_UUID; + options->tcp_sndbuf = 0; /* 0 means don't change OS default */ + options->tcp_rcvbuf = 0; /* 0 means don't change OS default */ + options->dsireadbuf = 12; } /* parse an afpd.conf line. i'm doing it this way because it's @@ -220,7 +215,10 @@ int afp_options_parseline(char *buf, struct afp_options *options) if (strstr(buf, " -slp")) options->flags &= ~OPTION_NOSLP; #endif - +#ifdef USE_ZEROCONF + if (strstr(buf, " -nozeroconf")) + options->flags |= OPTION_NOZEROCONF; +#endif if (strstr(buf, " -nouservolfirst")) options->flags &= ~OPTION_USERVOLFIRST; if (strstr(buf, " -uservolfirst")) @@ -237,6 +235,8 @@ int afp_options_parseline(char *buf, struct afp_options *options) options->flags |= OPTION_CUSTOMICON; if (strstr(buf, " -advertise_ssh")) options->flags |= OPTION_ANNOUNCESSH; + if (strstr(buf, " -noacl2maccess")) + options->flags &= ~OPTION_ACL2MACCESS; /* passwd bits */ if (strstr(buf, " -nosavepassword")) @@ -281,8 +281,22 @@ int afp_options_parseline(char *buf, struct afp_options *options) options->defaultvol.name = opt; if ((c = getoption(buf, "-systemvol")) && (opt = strdup(c))) options->systemvol.name = opt; - if ((c = getoption(buf, "-loginmesg")) && (opt = strdup(c))) + if ((c = getoption(buf, "-loginmesg")) && (opt = strdup(c))) { + int i = 0, j = 0; + while (c[i]) { + if (c[i] != '\\') { + opt[j++] = c[i]; + } else { + i++; + if (c[i] == 'n') + opt[j++] = '\n'; + } + i++; + } + opt[j] = 0; options->loginmesg = opt; + + } if ((c = getoption(buf, "-guestname")) && (opt = strdup(c))) options->guest = opt; if ((c = getoption(buf, "-passwdfile")) && (opt = strdup(c))) @@ -311,6 +325,12 @@ int afp_options_parseline(char *buf, struct afp_options *options) } } + if ((c = getoption(buf, "-dsireadbuf"))) { + options->dsireadbuf = atoi(c); + if (options->dsireadbuf < 6) + options->dsireadbuf = 6; + } + if ((c = getoption(buf, "-server_quantum"))) options->server_quantum = strtoul(c, NULL, 0); @@ -332,6 +352,7 @@ int afp_options_parseline(char *buf, struct afp_options *options) char *optstr; if ((optstr = getoption(c, "-setuplog"))) { setuplog(optstr); + options->logconfig = optstr; /* at least store the last (possibly only) one */ c += sizeof("-setuplog"); } } @@ -399,7 +420,7 @@ int afp_options_parseline(char *buf, struct afp_options *options) if ((c = getoption(buf, "-ddpaddr"))) atalk_aton(c, &options->ddpaddr); if ((c = getoption(buf, "-signature")) && (opt = strdup(c))) - options->signature = opt; + options->signatureopt = opt; /* do a little checking for the domain name. */ if ((c = getoption(buf, "-fqdn"))) { @@ -448,7 +469,25 @@ int afp_options_parseline(char *buf, struct afp_options *options) if ((c = getoption(buf, "-ntseparator")) && (opt = strdup(c))) options->ntseparator = opt; + + if ((c = getoption(buf, "-dircachesize"))) + options->dircachesize = atoi(c); + if ((c = getoption(buf, "-tcpsndbuf"))) + options->tcp_sndbuf = atoi(c); + + if ((c = getoption(buf, "-tcprcvbuf"))) + options->tcp_rcvbuf = atoi(c); + + if ((c = getoption(buf, "-fcelistener"))) { + LOG(log_note, logtype_afpd, "Adding fce listener \"%s\"", c); + fce_add_udp_socket(c); + } + if ((c = getoption(buf, "-fcecoalesce"))) { + LOG(log_ote, logtype_afpd, "Fce coalesce: %s", c); + fce_set_coalesce(c); + } + return 1; } @@ -467,18 +506,15 @@ static void show_version( void ) puts( "afpd has been compiled with support for these features:\n" ); - printf( " AFP3.x support:\t" ); -#ifdef AFP3x - puts( "Yes" ); -#else - puts( "No" ); -#endif + printf( " AFP3.x support:\tYes\n" ); + printf( " TCP/IP Support:\t" ); + puts( "Yes" ); - printf( " Transport layers:\t" ); + printf( "DDP(AppleTalk) Support:\t" ); #ifdef NO_DDP - puts( "TCP/IP" ); + puts( "No" ); #else - puts( "TCP/IP DDP" ); + puts( "Yes" ); #endif printf( " CNID backends:\t" ); @@ -525,6 +561,13 @@ static void show_version_extended(void ) puts( "No" ); #endif + printf( " Zeroconf support:\t" ); +#ifdef USE_ZEROCONF + puts( "Yes" ); +#else + puts( "No" ); +#endif + printf( " TCP wrappers support:\t" ); #ifdef TCPWRAP puts( "Yes" ); @@ -573,6 +616,23 @@ static void show_version_extended(void ) #else puts( "No" ); #endif + + printf( " ACL support:\t" ); +#ifdef HAVE_ACLS + puts( "Yes" ); +#else + puts( "No" ); +#endif + + printf( " EA support:\t" ); + puts( EA_MODULES ); + + printf( " LDAP support:\t" ); +#ifdef HAVE_LDAP + puts( "Yes" ); +#else + puts( "No" ); +#endif } /* @@ -583,17 +643,26 @@ static void show_paths( void ) printf( " afpd.conf:\t%s\n", _PATH_AFPDCONF ); printf( " AppleVolumes.system:\t%s\n", _PATH_AFPDSYSVOL ); printf( " AppleVolumes.default:\t%s\n", _PATH_AFPDDEFVOL ); + printf( " afp_signature.conf:\t%s\n", _PATH_AFPDSIGCONF ); + printf( " afp_voluuid.conf:\t%s\n", _PATH_AFPDUUIDCONF ); +#ifdef HAVE_LDAP + printf( " afp_ldap.conf:\t%s\n", _PATH_ACL_LDAPCONF ); +#else + printf( " afp_ldap.conf:\tnot supported\n"); +#endif printf( " UAM search path:\t%s\n", _PATH_AFPDUAMPATH ); + printf( " Server messages path:\t%s\n", SERVERTEXT); + printf( " lockfile:\t%s\n", _PATH_AFPDLOCK); } /* - * Display usage information about adpd. + * Display usage information about afpd. */ static void show_usage( char *name ) { - fprintf( stderr, "Usage:\t%s [-dDIptTu] [-c maxconnections] [-f defaultvolumes] [-F config]\n", name ); - fprintf( stderr, "\t [-g guest] [-L message] [-m umask][-n nbpname] [-P pidfile]\n" ); - fprintf( stderr, "\t [-s systemvolumes] [-S port] [-U uams]\n" ); + fprintf( stderr, "Usage:\t%s [-duptDTI] [-f defaultvolumes] [-s systemvolumes] [-n nbpname]\n", name ); + fprintf( stderr, "\t [-c maxconnections] [-g guest] [-P pidfile] [-S port] [-L message]\n" ); + fprintf( stderr, "\t [-F configfile] [-U uams] [-m umask]\n" ); fprintf( stderr, "\t%s -h|-v|-V\n", name ); }