/*
- * $Id: afp_options.c,v 1.49 2009-11-06 09:16:15 franklahm 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.
#include "globals.h"
#include "status.h"
#include "auth.h"
+#include "fce_api.h"
#include <atalk/compat.h>
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))
options->defaultvol.name = _PATH_AFPDDEFVOL;
options->systemvol.name = _PATH_AFPDSYSVOL;
options->configfile = _PATH_AFPDCONF;
+ options->sigconffile = _PATH_AFPDSIGCONF;
options->uampath = _PATH_AFPDUAMPATH;
options->uamlist = "uams_dhx.so,uams_dhx2.so";
options->guest = "nobody";
options->sleep = 10* 120; /* 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;
options->volnamelen = 80; /* spec: 255, 10.1: 73, 10.4/10.5: 80 */
options->ntdomain = NULL;
options->ntseparator = NULL;
+#ifdef USE_SRVLOC
+ /* don't advertize slp by default */
+ options->flags |= OPTION_NOSLP;
+#endif
}
/* parse an afpd.conf line. i'm doing it this way because it's
if (strstr(buf, " -nodebug"))
options->flags &= ~OPTION_DEBUG;
#ifdef USE_SRVLOC
- if (strstr(buf, " -noslp"))
- options->flags |= OPTION_NOSLP;
-#endif /* USE_SRVLOC */
+ if (strstr(buf, " -slp"))
+ options->flags &= ~OPTION_NOSLP;
+#endif
if (strstr(buf, " -nouservolfirst"))
options->flags &= ~OPTION_USERVOLFIRST;
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"))) {
if ((c = getoption(buf, "-ntseparator")) && (opt = strdup(c)))
options->ntseparator = opt;
-
+
+ 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;
}
puts( "afpd has been compiled with support for these features:\n" );
- printf( " AFP3.1 support:\t" );
+ printf( " AFP3.x support:\t" );
#ifdef AFP3x
puts( "Yes" );
#else
static void show_paths( void )
{
printf( " afpd.conf:\t%s\n", _PATH_AFPDCONF );
+ printf( " afp_signature.conf:\t%s\n", _PATH_AFPDSIGCONF );
printf( " AppleVolumes.system:\t%s\n", _PATH_AFPDSYSVOL );
printf( " AppleVolumes.default:\t%s\n", _PATH_AFPDDEFVOL );
printf( " UAM search path:\t%s\n", _PATH_AFPDUAMPATH );
+ printf( " Server messages path:\t%s\n", SERVERTEXT);
}
/*
- * 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 );
}