Big configure.in cleanup

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

diff --git a/etc/afpd/afp_options.c b/etc/afpd/afp_options.c
index 407a594a769511d4aa39c9cbde24aba75b3c23a7..d89c5501e8097ded5710121685627440e727ce1c 100644 (file)
--- a/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@ -159,8 +159,9 @@ 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->timeout = 4;       /* 4 tickles = 2 minutes */
     options->sleep = 10* 120; /* 10 h in 30 seconds tick */
+    options->disconnected = 20; /* 20 * 30 s (default tickleval) = 10 minutes */
     options->server_notif = 1;
     options->authprintdir = NULL;
     options->signatureopt = "auto";
@@ -406,8 +407,10 @@ 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;
 
@@ -480,13 +483,7 @@ 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" );
 
@@ -583,20 +580,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( "           ACL support:\t" );
 #ifdef HAVE_ACLS
        puts( "Yes" );