X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fafp_options.c;h=f06bfb373665ca9bc4ff25c8be20501ceb04619e;hb=f254fd618b53e97cc5382b23709d4f3de1e70b41;hp=3b37538b642c312f212f6e1821dc601d6da34a84;hpb=8a1fcacef082abe5bdb60421b3129d7cd39f6b76;p=netatalk.git

diff --git a/etc/afpd/afp_options.c b/etc/afpd/afp_options.c
index 3b37538b..f06bfb37 100644
--- a/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@ -44,55 +44,6 @@
 
 #define LENGTH 512
 
-/* get rid of any allocated afp_option buffers. */
-void afp_options_free(struct afp_options *opt)
-{
-	if (opt->hostname)
-        free(opt->hostname);
-	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);
-}
-
 /*
  * Show version information about afpd.
  * Used by "afp -v".
@@ -142,6 +93,9 @@ static void show_version( void )
 #endif
 #ifdef CNID_BACKEND_TDB
 	printf( "tdb " );
+#endif
+#ifdef CNID_BACKEND_MYSQL
+	printf( "mysql " );
 #endif
 	puts( "" );
 }
@@ -155,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
@@ -212,6 +168,20 @@ 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( "         DTrace probes:\t" );
+#ifdef WITH_DTRACE
+	puts( "Yes" );
+#else
+	puts( "No" );
+#endif
 }
 
 /*
@@ -220,11 +190,12 @@ 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);
 }
 
 /*
@@ -240,7 +211,7 @@ void afp_options_parse_cmdline(AFPObj *obj, int ac, char **av)
 {
     int c, err = 0;
 
-    while (EOF != ( c = getopt( ac, av, "dFvVh" )) ) {
+    while (EOF != ( c = getopt( ac, av, "dF:vVh" )) ) {
         switch ( c ) {
         case 'd':
             obj->cmdlineflags |= OPTION_DEBUG;