Merge master

[netatalk.git] / etc / afpd / afp_options.c

diff --git a/etc/afpd/afp_options.c b/etc/afpd/afp_options.c
index a66ef8a9c783d35a7e4828b99d0e22470029fc44..256c91a56676a535c4e428ff9f16b23f117d3317 100644 (file)
--- a/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@ -431,10 +431,6 @@ int afp_options_parseline(char *buf, struct afp_options *options)
 
     if ((c = getoption(buf, "-port")))
         options->port = strdup(c);
-#ifndef NO_DDP
-    if ((c = getoption(buf, "-ddpaddr")))
-        atalk_aton(c, &options->ddpaddr);
-#endif
     if ((c = getoption(buf, "-signature")) && (opt = strdup(c)))
         options->signatureopt = opt;
 
@@ -544,13 +540,6 @@ static void show_version( void )
        }
        puts( "" );
 
-       printf( "DDP(AppleTalk) Support:\t" );
-#ifdef NO_DDP
-       puts( "No" );
-#else
-       puts( "Yes" );
-#endif
-
        printf( "         CNID backends:\t" );
 #ifdef CNID_BACKEND_CDB
        printf( "cdb ");
@@ -637,20 +626,6 @@ static void show_version_extended(void )
        puts( "No" );
 #endif
 
-       printf( "        Dropbox kludge:\t" );
-#ifdef DROPKLUDGE
-       puts( "Yes" );
-#else
-       puts( "No" );
-#endif
-
-       printf( "  Force volume uid/gid:\t" );
-#ifdef FORCE_UIDGID
-       puts( "Yes" );
-#else
-       puts( "No" );
-#endif
-
        printf( "            EA support:\t" );
        puts( EA_MODULES );