X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fafp_options.c;h=95faf80807aa078f2b9fc005c8c30a729ec14104;hb=e47aca85cd9009e0b7e8f332c133daef4ca785ec;hp=b4e2306d21497af063ed486649bec3c4bbd5cc57;hpb=260c314546ffcfdbef47f2c7de82d5310b26df0a;p=netatalk.git

diff --git a/etc/afpd/afp_options.c b/etc/afpd/afp_options.c
index b4e2306d..95faf808 100644
--- a/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@ -44,252 +44,6 @@
 
 #define LENGTH 512
 
-/* get rid of any allocated afp_option buffers. */
-void afp_options_free(struct afp_options *opt)
-{
-	if (opt->adminauthuser)
-        free(opt->adminauthuser);
-	if (opt->configfile)
-        free(opt->configfile);
-    if (opt->fqdn)
-        free(opt->fqdn);
-    if (opt->guest)
-        free(opt->guest);
-    if (opt->listen)
-        free(opt->listen);
-    if (opt->k5realm)
-        free(opt->k5realm);
-    if (opt->k5keytab)
-        free(opt->k5keytab);
-    if (opt->k5service)
-        free(opt->k5service);
-    if (opt->logconfig)
-        free(opt->logconfig);
-    if (opt->logfile)
-        free(opt->logfile);
-    if (opt->loginmesg)
-        free(opt->loginmesg);
-    if (opt->maccodepage)
-        free(opt->maccodepage);
-	if (opt->mimicmodel)
-        free(opt->mimicmodel);
-    if (opt->ntdomain)
-        free(opt->ntdomain);
-    if (opt->ntseparator)
-        free(opt->ntseparator);
-    if (opt->passwdfile)
-        free(opt->passwdfile);
-    if (opt->port)
-        free(opt->port);
-    if (opt->signatureopt)
-        free(opt->signatureopt);
-    if (opt->uamlist)
-        free(opt->uamlist);
-    if (opt->uampath)
-        free(opt->uampath);
-    if (opt->unixcodepage)
-        free(opt->unixcodepage);
-}
-
-#define MAXVAL 1024
-int afp_config_parse(AFPObj *AFPObj)
-{
-    EC_INIT;
-    dictionary *config;
-    struct afp_options *options = &AFPObj->options;
-    int i, c;
-    const char *p, *tmp;
-    char *q, *r;
-    char val[MAXVAL];
-
-    memset(options, 0, sizeof(struct afp_options));
-    options->configfile  = strdup(_PATH_CONFDIR "afp.conf");
-    options->sigconffile = strdup(_PATH_CONFDIR "afp_signature.conf");
-    options->uuidconf    = strdup(_PATH_CONFDIR "afp_voluuid.conf");
-    options->flags |= OPTION_ACL2MACCESS | OPTION_UUID | OPTION_SERVERNOTIF;
-    if (gethostname(val, sizeof(val)) < 0 ) {
-        perror( "gethostname" );
-        return 0;
-    }
-    if (NULL != (q = strchr(val, '.')))
-        *q = '\0';
-    options->hostname = strdup(val);
-
-    while ((c = getopt(AFPObj->argc, AFPObj->argv, "dF:")) != -1) {
-        switch (c) {
-        case 'd':
-            options->flags |= OPTION_DEBUG;
-            break;
-        case 'F':
-            if (options->configfile)
-                free(options->configfile);
-            options->configfile = strdup(optarg);
-            break;
-        default :
-            break;
-        }
-    }
-
-    if ((config = iniparser_load(AFPObj->options.configfile)) == NULL)
-        return -1;
-    AFPObj->iniconfig = config;
-
-    /* [Global] */
-    options->logconfig = iniparser_getstrdup(config, INISEC_GLOBAL, "loglevel", "default:note");
-    options->logfile   = iniparser_getstrdup(config, INISEC_GLOBAL, "logfile",  NULL);
-    set_processname("afpd");
-    setuplog(options->logconfig, options->logfile);
-
-    /* [AFP] "options" options wo values */
-    p = iniparser_getstring(config, INISEC_AFP, "options", "");
-    strcpy(val, " ");
-    strlcat(val, p, MAXVAL);
-
-    if (strstr(val, " nozeroconf"))
-        options->flags |= OPTION_NOZEROCONF;
-    if (strstr(val, " icon"))
-        options->flags |= OPTION_CUSTOMICON;
-    if (strstr(val, " noicon"))
-        options->flags &= ~OPTION_CUSTOMICON;
-    if (strstr(val, " advertise_ssh"))
-        options->flags |= OPTION_ANNOUNCESSH;
-    if (strstr(val, " noacl2maccess"))
-        options->flags &= ~OPTION_ACL2MACCESS;
-    if (strstr(val, " keepsessions"))
-        options->flags |= OPTION_KEEPSESSIONS;
-    if (strstr(val, " keepsessions"))
-        options->flags |= OPTION_CLOSEVOL;
-    if (strstr(val, " client_polling"))
-        options->flags &= ~OPTION_SERVERNOTIF;
-    if (strstr(val, " nosavepassword"))
-        options->passwdbits |= PASSWD_NOSAVE;
-    if (strstr(val, " savepassword"))
-        options->passwdbits &= ~PASSWD_NOSAVE;
-    if (strstr(val, " nosetpassword"))
-        options->passwdbits &= ~PASSWD_SET;
-    if (strstr(val, " setpassword"))
-        options->passwdbits |= PASSWD_SET;
-
-    /* figure out options w values */
-
-    options->loginmesg      = iniparser_getstrdup(config, INISEC_AFP, "loginmesg",      "");
-    options->guest          = iniparser_getstrdup(config, INISEC_AFP, "guestname",      "nobody");
-    options->passwdfile     = iniparser_getstrdup(config, INISEC_AFP, "passwdfile",     _PATH_AFPDPWFILE);
-    options->uampath        = iniparser_getstrdup(config, INISEC_AFP, "uampath",        _PATH_AFPDUAMPATH);
-    options->uamlist        = iniparser_getstrdup(config, INISEC_AFP, "uamlist",        "uams_dhx.so,uams_dhx2.so");
-    options->port           = iniparser_getstrdup(config, INISEC_AFP, "port",           "548");
-    options->signatureopt   = iniparser_getstrdup(config, INISEC_AFP, "signature",      "auto");
-    options->k5service      = iniparser_getstrdup(config, INISEC_AFP, "k5service",      NULL);
-    options->k5realm        = iniparser_getstrdup(config, INISEC_AFP, "k5realm",        NULL);
-    options->authprintdir   = iniparser_getstrdup(config, INISEC_AFP, "authprintdir",   NULL);
-    options->listen         = iniparser_getstrdup(config, INISEC_AFP, "listen",         NULL);
-    options->hostname       = iniparser_getstrdup(config, INISEC_AFP, "hostname",       NULL);
-    options->ntdomain       = iniparser_getstrdup(config, INISEC_AFP, "ntdomain",       NULL);
-    options->ntseparator    = iniparser_getstrdup(config, INISEC_AFP, "ntseparator",    NULL);
-    options->mimicmodel     = iniparser_getstrdup(config, INISEC_AFP, "mimicmodel",     NULL);
-    options->adminauthuser  = iniparser_getstrdup(config, INISEC_AFP, "adminauthuser",  NULL);
-    options->connections    = iniparser_getint   (config, INISEC_AFP, "maxcon",         200);
-    options->passwdminlen   = iniparser_getint   (config, INISEC_AFP, "passwdminlen",   0);
-    options->tickleval      = iniparser_getint   (config, INISEC_AFP, "tickleval",      30);
-    options->timeout        = iniparser_getint   (config, INISEC_AFP, "timeout",        4);
-    options->dsireadbuf     = iniparser_getint   (config, INISEC_AFP, "dsireadbuf",     12);
-    options->server_quantum = iniparser_getint   (config, INISEC_AFP, "server_quantum", DSI_SERVQUANT_DEF);
-    options->volnamelen     = iniparser_getint   (config, INISEC_AFP, "volnamelen",     80);
-    options->dircachesize   = iniparser_getint   (config, INISEC_AFP, "dircachesize",   DEFAULT_MAX_DIRCACHE_SIZE);
-    options->tcp_sndbuf     = iniparser_getint   (config, INISEC_AFP, "tcpsndbuf",      0);
-    options->tcp_rcvbuf     = iniparser_getint   (config, INISEC_AFP, "tcprcvbuf",      0);
-    options->fce_fmodwait   = iniparser_getint   (config, INISEC_AFP, "fceholdfmod",    60);
-    options->sleep          = iniparser_getint   (config, INISEC_AFP, "sleep",          10) * 60 * 2;
-    options->disconnected   = iniparser_getint   (config, INISEC_AFP, "disconnect",     24) * 60 * 2;
-
-
-    if ((p = iniparser_getstring(config, INISEC_AFP, "k5keytab", NULL))) {
-        EC_NULL_LOG( options->k5keytab = malloc(strlen(p) + 14) );
-        snprintf(options->k5keytab, strlen(p) + 14, "KRB5_KTNAME=%s", p);
-        putenv(options->k5keytab);
-    }
-
-#ifdef ADMIN_GRP
-    if ((p = iniparser_getstring(config, INISEC_AFP, "admingroup",  NULL))) {
-         struct group *gr = getgrnam(p);
-         if (gr != NULL)
-             options->admingid = gr->gr_gid;
-    }
-#endif /* ADMIN_GRP */
-
-    q = iniparser_getstrdup(config, INISEC_AFP, "cnidserver", "localhost:4700");
-    r = strrchr(q, ':');
-    if (r)
-        *r = 0;
-    options->Cnid_srv = strdup(q);
-    if (r)
-        options->Cnid_port = strdup(r + 1);
-    LOG(log_debug, logtype_afpd, "CNID Server: %s:%s", options->Cnid_srv, options->Cnid_port);
-    if (q)
-        free(q);
-
-    if ((q = iniparser_getstrdup(config, INISEC_AFP, "fqdn", NULL))) {
-        /* do a little checking for the domain name. */
-        r = strchr(q, ':');
-        if (r)
-            *r = '\0';
-        if (gethostbyname(q)) {
-            if (r)
-                *r = ':';
-            EC_NULL_LOG( options->fqdn = strdup(q) );
-        } else {
-            LOG(log_error, logtype_afpd, "error parsing -fqdn, gethostbyname failed for: %s", c);
-        }
-        free(q);
-    }
-
-    p = iniparser_getstring(config, INISEC_AFP, "unixcodepage", "LOCALE");
-    if ((options->unixcharset = add_charset(p)) == (charset_t)-1) {
-        options->unixcharset = CH_UNIX;
-        LOG(log_warning, logtype_afpd, "Setting Unix codepage to '%s' failed", p);
-    } else {
-        options->unixcodepage = strdup(p);
-    }
-	
-    p = iniparser_getstring(config, INISEC_AFP, "maccodepage", "MAC_ROMAN");
-    if ((options->maccharset = add_charset(p)) == (charset_t)-1) {
-        options->maccharset = CH_MAC;
-        LOG(log_warning, logtype_afpd, "Setting Unix codepage to '%s' failed", p);
-    } else {
-        options->maccodepage = strdup(p);
-    }
-
-    if ((p = iniparser_getstring(config, INISEC_AFP, "fcelistener", NULL))) {
-		LOG(log_note, logtype_afpd, "Adding FCE listener: %s", p);
-		fce_add_udp_socket(p);
-    }
-    if ((p = iniparser_getstring(config, INISEC_AFP, "fcecoalesce", NULL))) {
-		LOG(log_note, logtype_afpd, "Fce coalesce: %s", p);
-		fce_set_coalesce(p);
-    }
-    if ((p = iniparser_getstring(config, INISEC_AFP, "fceevents", NULL))) {
-		LOG(log_note, logtype_afpd, "Fce events: %s", p);
-		fce_set_events(p);
-    }
-
-    /* Check for sane values */
-    if (options->tickleval <= 0)
-        options->tickleval = 30;
-    if (options->timeout <= 0)
-        options->timeout = 4;
-    if (options->sleep <= 4)
-        options->disconnected = options->sleep = 4;
-    if (options->dsireadbuf < 6)
-        options->dsireadbuf = 6;
-    if (options->volnamelen < 8)
-        options->volnamelen = 8; /* max mangled volname "???#FFFF" */
-    if (options->volnamelen > 255)
-	    options->volnamelen = 255; /* AFP3 spec */
-
-EC_CLEANUP:
-    EC_EXIT;
-}
-
 /*
  * Show version information about afpd.
  * Used by "afp -v".
@@ -339,6 +93,9 @@ static void show_version( void )
 #endif
 #ifdef CNID_BACKEND_TDB
 	printf( "tdb " );
+#endif
+#ifdef CNID_BACKEND_MYSQL
+	printf( "mysql " );
 #endif
 	puts( "" );
 }
@@ -352,8 +109,10 @@ static void show_version_extended(void )
 	show_version( );
 
 	printf( "      Zeroconf support:\t" );
-#ifdef USE_ZEROCONF
-	puts( "Yes" );
+#if defined (HAVE_MDNS)
+	puts( "mDNSResponder" );
+#elif defined (HAVE_AVAHI)
+	puts( "Avahi" );
 #else
 	puts( "No" );
 #endif
@@ -409,6 +168,27 @@ static void show_version_extended(void )
 #else
 	puts( "No" );
 #endif
+
+	printf( "         D-Bus support:\t" );
+#ifdef HAVE_DBUS_GLIB
+	puts( "Yes" );
+#else
+	puts( "No" );
+#endif
+
+	printf( "     Spotlight support:\t" );
+#ifdef HAVE_TRACKER
+	puts( "Yes" );
+#else
+	puts( "No" );
+#endif
+
+	printf( "         DTrace probes:\t" );
+#ifdef WITH_DTRACE
+	puts( "Yes" );
+#else
+	puts( "No" );
+#endif
 }
 
 /*
@@ -417,32 +197,35 @@ static void show_version_extended(void )
 static void show_paths( void )
 {
 	printf( "              afp.conf:\t%s\n", _PATH_CONFDIR "afp.conf");
-	printf( "    afp_signature.conf:\t%s\n", _PATH_CONFDIR "afp_signature.conf");
-	printf( "      afp_voluuid.conf:\t%s\n", _PATH_CONFDIR "afp_voluuid.conf");
+	printf( "           extmap.conf:\t%s\n", _PATH_CONFDIR "extmap.conf");
+	printf( "       state directory:\t%s\n", _PATH_STATEDIR);
+	printf( "    afp_signature.conf:\t%s\n", _PATH_STATEDIR "afp_signature.conf");
+	printf( "      afp_voluuid.conf:\t%s\n", _PATH_STATEDIR "afp_voluuid.conf");
 	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 afpd.
  */
-static void show_usage( char *name )
+static void show_usage(void)
 {
-	fprintf( stderr, "Usage:\t%s [-duptDTI] [-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 );
+	fprintf( stderr, "Usage:\tafpd [-d] [-F configfile]\n");
+	fprintf( stderr, "\tafpd -h|-v|-V\n");
 }
 
-void afp_options_parse_cmdline(int ac, char **av)
+void afp_options_parse_cmdline(AFPObj *obj, int ac, char **av)
 {
-    char *p;
-    char *tmp;	/* Used for error checking the result of strtol */
     int c, err = 0;
 
-    while (EOF != ( c = getopt( ac, av, "vVh" )) ) {
+    while (EOF != ( c = getopt( ac, av, "dF:vVh" )) ) {
         switch ( c ) {
+        case 'd':
+            obj->cmdlineflags |= OPTION_DEBUG;
+            break;
+        case 'F':
+            obj->cmdlineconfigfile = strdup(optarg);
+            break;
         case 'v':	/* version */
             show_version( ); puts( "" );
             show_paths( ); puts( "" );
@@ -454,7 +237,7 @@ void afp_options_parse_cmdline(int ac, char **av)
             exit( 0 );
             break;
         case 'h':	/* usage */
-            show_usage( p );
+            show_usage();
             exit( 0 );
             break;
         default :
@@ -462,7 +245,7 @@ void afp_options_parse_cmdline(int ac, char **av)
         }
     }
     if ( err || optind != ac ) {
-        show_usage( p );
+        show_usage();
         exit( 2 );
     }