Cant disable AFP3x anymore

diff --git a/NEWS b/NEWS
index a811ac7e5abafa99d6f907c6cf8e76d7a32a7e23..f40686f5fdb3814126437f72b66fb6e4eab2818b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,8 @@
 Changes in 2.2beta2
 ====================
 
-* NEW: afpd: primary AFP reconnect
-* NEW: afpd: AFP replay cache
+* NEW: afpd: AFP 3.3
+* UPD: afpd: AFP 3.x can't be disabled
 
 Changes in 2.2beta1
 ====================

diff --git a/configure.in b/configure.in
index beef88e419c5811dc35471855ada4f12a9f59861..5bce2794280061f2070215b0edb1e872fce6a0b6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -249,39 +249,7 @@ AC_ARG_ENABLE(debugging,
        ]
 )
 
-
-afp3=no
-afp3set=no
-AC_MSG_CHECKING([whether AFP 3.x calls should be enabled])
-AC_ARG_ENABLE(afp3,
-       [  --disable-afp3          disable AFP 3.x calls],
-       [
-           if test x"$enableval" != x"no"; then
-               afp3set=yes
-               afp3=yes
-               AC_MSG_RESULT([yes])
-           else
-               AC_MSG_RESULT([no])
-           fi
-       ],[
-           AC_MSG_RESULT([yes])
-           afp3=yes
-       ]
-)
-
-if test x"$afp3" = x"yes"; then
-        AC_SYS_LARGEFILE([
-               AC_DEFINE(AFP3x, 1, [Define to enable AFP 3.x support])
-       ],[
-               if test x"$afp3set" = x"yes"; then
-                       AC_MSG_ERROR([AFP 3.x support requires Large File Support.])
-               else
-                       AC_MSG_WARN([AFP 3.x support requires Large File Support. AFP3.x support disabled])
-                       afp3=no
-               fi
-       ])
-fi
-
+AC_SYS_LARGEFILE([], AC_MSG_ERROR([AFP 3.x support requires Large File Support.]))
 AC_CHECK_ICONV
 
 dnl ----------- A NOTE ABOUT DROPKLUDGE

diff --git a/etc/afpd/afp_options.c b/etc/afpd/afp_options.c
index b8e5130b67a6ccc58f5d0b3653a0d54cf523bbcb..6d5fb0dfcf371efe211fa971b64caa2a26125f84 100644 (file)
--- a/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@ -481,13 +481,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" );
 

diff --git a/etc/afpd/auth.c b/etc/afpd/auth.c
index 3e0fd5ebeecae396babc23d48c6d7ee859e99a1e..0bb6027c8f8b79d335659ed86f8ebb92f5124e08 100644 (file)
--- a/etc/afpd/auth.c
+++ b/etc/afpd/auth.c
@@ -79,11 +79,10 @@ static struct afp_versions  afp_versions[] = {
     { "AFPVersion 2.1", 21 },
 #endif /* ! NO_DDP */
     { "AFP2.2", 22 },
-#ifdef AFP3x
     { "AFPX03", 30 },
     { "AFP3.1", 31 },
-    { "AFP3.2", 32 }
-#endif /* AFP3x */
+    { "AFP3.2", 32 },
+    { "AFP3.3", 33 }
 };
 
 static struct uam_mod uam_modules = {NULL, NULL, &uam_modules, &uam_modules};

diff --git a/etc/afpd/main.c b/etc/afpd/main.c
index 6fa49cf4017f07919ff84e55ddc14c0d42f82049..0d552d6f73c77faa3478f4a37702fb630aa6e7a3 100644 (file)
--- a/etc/afpd/main.c
+++ b/etc/afpd/main.c
@@ -229,7 +229,6 @@ int main(int ac, char **av)
     }
 
     memset(&sv, 0, sizeof(sv));    
-#ifdef AFP3x
     /* linux at least up to 2.4.22 send a SIGXFZ for vfat fs,
        even if the file is open with O_LARGEFILE ! */
 #ifdef SIGXFSZ
@@ -239,7 +238,6 @@ int main(int ac, char **av)
         LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) );
         exit(EXITERR_SYS);
     }
-#endif
 #endif
     
     sv.sa_handler = child_handler;

diff --git a/etc/afpd/uam.c b/etc/afpd/uam.c
index 532a620155f7c748835f32a83a53aa882cdc6575..92173915c5f5cc5e7dfa8934c00f1a1ba34a1d85 100644 (file)
--- a/etc/afpd/uam.c
+++ b/etc/afpd/uam.c
@@ -56,11 +56,7 @@ char *strchr (), *strrchr ();
 #include "auth.h"
 #include "uam_auth.h"
 
-#ifdef AFP3x
 #define utf8_encoding() (afp_version >= 30)
-#else
-#define utf8_encoding() (0)
-#endif
 
 #ifdef TRU64
 #include <netdb.h>

diff --git a/include/atalk/volume.h b/include/atalk/volume.h
index 77966459b2618f69d3cff16faeae7680a00bb9e0..c2db33db7ccc6d1a4a6268e7a64f5cfdab12e0ad 100644 (file)
--- a/include/atalk/volume.h
+++ b/include/atalk/volume.h
@@ -197,11 +197,7 @@ int wincheck(const struct vol *vol, const char *path);
 #define VOLPBIT_XBTOTAL 10
 #define VOLPBIT_BSIZE   11        /* block size */
 
-#ifdef AFP3x
 #define utf8_encoding() (afp_version >= 30)
-#else
-#define utf8_encoding() (0)
-#endif
 
 #define vol_noadouble(vol) (((vol)->v_flags & AFPVOL_NOADOUBLE) ? 1 : 0)
 #define vol_nodev(vol) (((vol)->v_flags & AFPVOL_NODEV) ? 1 : 0)