AppleTalk Support, or not?

diff --git a/NEWS b/NEWS
index 3b77c1e9c4c46e889d085fdc4c37c6e630e9d4aa..8dc424db0990e43164406d9bfc8c71f07e9bc64c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 Changes in 2.2
 ==============
 
+* UPD: AppleTalk are disabled by configure script. if use, --enable-ddp.
 * NEW: afpd: dynamic directoy cache
 * NEW: afpd: POSIX 1e ACL support
 * NEW: afpd: automagic Zeroconf registration with avahi, registering both

diff --git a/configure.in b/configure.in
index a8fbc9c320597356898cc527f439bdd98c669594..28d74fdeea7a5fca6e481955ee8d766a62b4f001 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -235,7 +235,7 @@ AC_MSG_RESULT([$netatalk_cv_with_cracklib])
 netatalk_cv_ddp_enabled=no
 AC_MSG_CHECKING([whether to enable DDP])
 AC_ARG_ENABLE(ddp,
-       [  --enable-ddp           enable DDP],[
+       [  --enable-ddp            enable DDP (AppleTalk)],[
        if test "$enableval" = "yes"; then 
                AC_MSG_RESULT([yes])
                netatalk_cv_ddp_enabled=yes
@@ -1410,8 +1410,8 @@ AC_OUTPUT([Makefile
        sys/solaris/Makefile
        sys/sunos/Makefile
        sys/ultrix/Makefile
-    test/Makefile
-    test/afpd/Makefile
+       test/Makefile
+       test/afpd/Makefile
        ],
        [chmod a+x distrib/config/netatalk-config contrib/shell_utils/apple_*]
 )

diff --git a/etc/afpd/afp_options.c b/etc/afpd/afp_options.c
index 8c329972f60dcecfb7a46720a0cf1562c8199ca3..c1ce4bc98b24970a2e8c0076564733b96e60a365 100644 (file)
--- a/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@ -484,11 +484,14 @@ static void show_version( void )
        puts( "No" );
 #endif
 
-       printf( "      Transport layers:\t" );
+        printf( "        TCP/IP Support:\t" );
+        puts( "Yes" );
+
+       printf( "DDP(AppleTalk) Support:\t" );
 #ifdef NO_DDP
-       puts( "TCP/IP" );
+       puts( "No" );
 #else
-       puts( "TCP/IP DDP" );
+       puts( "Yes" );
 #endif
 
        printf( "         CNID backends:\t" );

diff --git a/macros/summary.m4 b/macros/summary.m4
index 4b970845e87c3422125532ae813a8079278e1853..7673d4822589523e6eafb14e3d2050e02bf15b0c 100644 (file)
--- a/macros/summary.m4
+++ b/macros/summary.m4
@@ -16,7 +16,6 @@ AC_DEFUN([AC_NETATALK_CONFIG_SUMMARY], [
                AC_MSG_RESULT([         Large file support (>2GB) for AFP3: $wx_largefile])
        fi
        AC_MSG_RESULT([         Extended Attributes: $neta_cv_eas])
-       AC_MSG_RESULT([         DDP enabled: $netatalk_cv_ddp_enabled])
        AC_MSG_RESULT([    CNID:])
        AC_MSG_RESULT([         backends: $compiled_backends])
        AC_MSG_RESULT([    UAMS:])
@@ -48,21 +47,22 @@ AC_DEFUN([AC_NETATALK_CONFIG_SUMMARY], [
        AC_MSG_RESULT([         passwd  ($uams_using_options)])
        AC_MSG_RESULT([         guest])
        AC_MSG_RESULT([    Options:])
-       AC_MSG_RESULT([         CUPS support:           $netatalk_cv_use_cups])
-       AC_MSG_RESULT([         SLP support:            $netatalk_cv_srvloc])
-       AC_MSG_RESULT([         Zeroconf support:       $netatalk_cv_zeroconf])
-       AC_MSG_RESULT([         tcp wrapper support:    $netatalk_cv_tcpwrap])
+       AC_MSG_RESULT([         DDP (AppleTalk) support: $netatalk_cv_ddp_enabled])
+       AC_MSG_RESULT([         CUPS support:            $netatalk_cv_use_cups])
+       AC_MSG_RESULT([         SLP support:             $netatalk_cv_srvloc])
+       AC_MSG_RESULT([         Zeroconf support:        $netatalk_cv_zeroconf])
+       AC_MSG_RESULT([         tcp wrapper support:     $netatalk_cv_tcpwrap])
 dnl    if test x"$netatalk_cv_linux_sendfile" != x; then
-dnl            AC_MSG_RESULT([         Linux sendfile support: $netatalk_cv_linux_sendfile])
+dnl            AC_MSG_RESULT([         Linux sendfile support:  $netatalk_cv_linux_sendfile])
 dnl    fi
-       AC_MSG_RESULT([         quota support:          $netatalk_cv_quotasupport])
-       AC_MSG_RESULT([         admin group support:    $netatalk_cv_admin_group])
-       AC_MSG_RESULT([         valid shell check:      $netatalk_cv_use_shellcheck])
-       AC_MSG_RESULT([         cracklib support:       $netatalk_cv_with_cracklib])
-       AC_MSG_RESULT([         dropbox kludge:         $netatalk_cv_dropkludge])
-       AC_MSG_RESULT([         force volume uid/gid:   $netatalk_cv_force_uidgid])
-       AC_MSG_RESULT([         Apple 2 boot support:   $compile_a2boot])
-       AC_MSG_RESULT([         ACL support:            $with_acl_support])
+       AC_MSG_RESULT([         quota support:           $netatalk_cv_quotasupport])
+       AC_MSG_RESULT([         admin group support:     $netatalk_cv_admin_group])
+       AC_MSG_RESULT([         valid shell check:       $netatalk_cv_use_shellcheck])
+       AC_MSG_RESULT([         cracklib support:        $netatalk_cv_with_cracklib])
+       AC_MSG_RESULT([         dropbox kludge:          $netatalk_cv_dropkludge])
+       AC_MSG_RESULT([         force volume uid/gid:    $netatalk_cv_force_uidgid])
+       AC_MSG_RESULT([         Apple 2 boot support:    $compile_a2boot])
+       AC_MSG_RESULT([         ACL support:             $with_acl_support])
        if test x"$use_pam_so" = x"yes" -a x"$netatalk_cv_install_pam" = x"no"; then
                AC_MSG_RESULT([])
                AC_MSG_WARN([ PAM support was configured for your system, but the netatalk PAM configuration file])