Removed the --with-catsearch configure option. (FPCatSearch is now always

enabled.)

diff --git a/acconfig.h b/acconfig.h
index e0a3d47e7d77d0875c1aaa0a72c69ab025bd7fdc..fa1f2e26184ec3483bb662db06edbba73359ad52 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -46,7 +46,6 @@
 #undef USE_MOUNT_H
 #undef USE_OLD_RQUOTA
 #undef USE_UFS_QUOTA_H
-#undef WITH_CATSEARCH
 #undef AFP3x
 #undef HAVE_DECL_ERRNO
 #undef HAVE_DECL_SYS_ERRLIST

diff --git a/configure.in b/configure.in
index 7c6ebcfd911c772d8d12e52aaa406a74ef1e14c5..bd453d4b224305efe745b2a977e9a1ee88c5347e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.171 2002-11-14 17:21:23 srittau Exp $
+dnl $Id: configure.in,v 1.172 2002-11-15 10:59:11 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -389,13 +389,6 @@ AC_ARG_WITH(uams-path,
        uams_path="${PKGCONFDIR}/uams"
 )
 
-AC_ARG_WITH(catsearch,
-       [  --with-catsearch     enable fpCatSearch functionality (experimental)],
-       if test "$withval" = "yes"; then
-           AC_DEFINE(WITH_CATSEARCH, 1)
-       fi
-)
-
 dnl --------------------------------------------------------------------------
 dnl FHS stuff has to be done last because it overrides other defaults
 dnl --------------------------------------------------------------------------

diff --git a/etc/afpd/auth.c b/etc/afpd/auth.c
index 3f6afafb270e8ccc8f902d275a3a7632881fcf8c..a61d668f434bc06730b59310d1acc8eb9cae5321 100644 (file)
--- a/etc/afpd/auth.c
+++ b/etc/afpd/auth.c
@@ -1,5 +1,5 @@
 /*
- * $Id: auth.c,v 1.36 2002-10-17 18:01:54 didg Exp $
+ * $Id: auth.c,v 1.37 2002-11-15 10:59:11 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -302,9 +302,7 @@ static int login(AFPObj *obj, struct passwd *pwd, void (*logout)(void))
        uam_afpserver_action(AFP_BYTELOCK_EXT,  UAM_AFPSERVER_POSTAUTH, afp_bytelock_ext, NULL); 
         /* catsearch_ext uses the same packet as catsearch FIXME double check this, it wasn't true for enue
            enumerate_ext */
-#ifdef WITH_CATSEARCH
        uam_afpserver_action(AFP_CATSEARCH_EXT, UAM_AFPSERVER_POSTAUTH, afp_catsearch, NULL); 
-#endif
        uam_afpserver_action(AFP_GETSESSTOKEN,  UAM_AFPSERVER_POSTAUTH, afp_getsession, NULL); 
        uam_afpserver_action(AFP_DISCTOLDSESS,  UAM_AFPSERVER_POSTAUTH, afp_disconnect, NULL); 
        uam_afpserver_action(AFP_READ_EXT,      UAM_AFPSERVER_POSTAUTH, afp_read_ext, NULL); 

diff --git a/etc/afpd/catsearch.c b/etc/afpd/catsearch.c
index 3f91e7191d2eeb99cf354c9746ae879fe3a22a2a..50a3564c3ebe8c0c7d59630ce69bdb0c78b36606 100644 (file)
--- a/etc/afpd/catsearch.c
+++ b/etc/afpd/catsearch.c
@@ -60,7 +60,6 @@
 #include "filedir.h"
 #include "fork.h"
 
-#ifdef WITH_CATSEARCH
 
 struct finderinfo {
        u_int32_t f_type;
@@ -772,6 +771,3 @@ int afp_catsearch(AFPObj *obj, char *ibuf, int ibuflen,
 /* FIXME: we need a clean separation between afp stubs and 'real' implementation */
 /* (so, all buffer packing/unpacking should be done in stub, everything else 
    should be done in other functions) */
-
-#endif
-/* WITH_CATSEARCH */

diff --git a/etc/afpd/switch.c b/etc/afpd/switch.c
index 7ca7742fc9cb783eb1bb3ac8da1206b650800fd7..c58c8ecfb436f622efbcaa80222d082ba38c84b1 100644 (file)
--- a/etc/afpd/switch.c
+++ b/etc/afpd/switch.c
@@ -1,5 +1,5 @@
 /*
- * $Id: switch.c,v 1.11 2002-10-12 16:42:31 didg Exp $
+ * $Id: switch.c,v 1.12 2002-11-15 10:59:11 srittau Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -143,11 +143,7 @@ int        (*postauth_switch[])() = {
     /*  24 -  31 */
     afp_setvolparams, afp_write, afp_getfildirparams, afp_setfildirparams,
     afp_changepw, afp_getuserinfo, afp_getsrvrmesg, afp_createid, /*  32 -  39 */
-#ifdef WITH_CATSEARCH
     afp_deleteid, afp_resolveid, afp_exchangefiles, afp_catsearch,
-#else
-    afp_deleteid, afp_resolveid, afp_exchangefiles, afp_null,
-#endif
     afp_null, afp_null, afp_null, afp_null,                    /*  40 -  47 */
     afp_opendt, afp_closedt, afp_null, afp_geticon,
     afp_geticoninfo, afp_addappl, afp_rmvappl, afp_getappl,    /*  48 -  55 */

diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c
index 658178f7b4a4b4eb2c0506eb251fef8cdd1e40d7..c5fef8ce8ca352e2722b804e9c0ce42e452e69a0 100644 (file)
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -1,5 +1,5 @@
 /*
- * $Id: volume.c,v 1.42 2002-10-26 16:39:42 didg Exp $
+ * $Id: volume.c,v 1.43 2002-11-15 10:59:11 srittau Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -990,9 +990,7 @@ int         *buflen;
                     ((utime(vol->v_path, NULL) < 0) && (errno == EROFS))) {
                 ashort |= VOLPBIT_ATTR_RO;
             }
-#ifdef WITH_CATSEARCH
             ashort |= VOLPBIT_ATTR_CATSEARCH;
-#endif
             if (afp_version >= 30) {
                 ashort |= VOLPBIT_ATTR_UTF8;
             }