Drop AFS detection.

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index e766f8b88acbead0c7e173fc0c7abd437d1dd7f1..d84e6c4b44b76892e4cb53564f3b745ce033505e 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -2495,82 +2495,6 @@ if test x$ZLIBS = x-lz; then
 fi
 AC_SUBST(ZLIBS)
 
-dnl
-dnl Check if we have AFS on this system
-dnl
-AFS_CFLAGS=""
-AFS_LIBS=""
-support_afs=auto
-AC_ARG_ENABLE(afs,
-   AC_HELP_STRING([--disable-afs], [disable afs support @<:@default=auto@:>@]),
-   [
-       if test x$enableval = xyes; then
-         support_afs=yes
-       elif test x$enableval = xno; then
-         support_afs=no
-       fi
-   ]
-)
-
-have_afs=no
-if test x$support_afs = xyes -o x$support_afs = xauto; then
-   AC_ARG_WITH(afsdir,
-      AC_HELP_STRING([--with-afsdir@<:@=DIR@:>@], [Directory holding AFS includes/libs]),
-      with_afsdir=$withval
-   )
-
-   dnl
-   dnl Search in standard places, or --with-afsdir not specified
-   dnl
-   if test x$with_afsdir = x; then
-      for root in /usr /usr/local; do
-        if test -d ${root}/include/afs/ ; then
-           with_afsdir=${root}
-           break
-        fi
-      done
-   fi
-
-   AFS_CFLAGS="-I${with_afsdir}/include"
-
-   saved_CFLAGS="${CFLAGS}"
-   CFLAGS="${AFS_CFLAGS} ${saved_CFLAGS}"
-
-   AC_CHECK_HEADERS(afs/stds.h)
-
-   CFLAGS="${saved_CFLAGS}"
-
-   dnl
-   dnl See if we can find a libsys with the pioctl symbol in there
-   dnl
-   for dir in ${with_afsdir}/lib ${with_afsdir}/lib/afs
-   do
-      for arch_type in .a .so
-      do
-        A=`test -f ${dir}/libsys${arch_type} && nm ${dir}/libsys${arch_type} | grep pioctl`
-        pkg=$?
-        if test $pkg = 0; then
-           have_afs=yes
-           AFS_LIBS="-L${dir} -lsys -lrx -llwp ${dir}/util.a"
-           break
-        fi
-      done
-   done
-
-   if test x$support_afs = xyes -a $have_afs != yes; then
-      AC_MSG_ERROR([afs support explicitly enabled but no supported afs implementation found, 
-  please either load the afs libraries or rerun configure without --enable-afs])
-   else
-      if test $have_afs = yes; then
-        AC_DEFINE([HAVE_AFS],1,[Defines if your system has AFS support])
-        AC_DEFINE([HAVE_AFS_ACL],1,[Andrew FileSystem ACL support])
-      fi
-   fi
-fi
-
-AC_SUBST(AFS_CFLAGS)
-AC_SUBST(AFS_LIBS)
-
 dnl
 dnl Check for ACL support and libraries
 dnl

diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in
index f96ce8d7568e69c4aef280ac719e8d4b6446eebd..8f0f10d024ba574fb05c03a4fd8b08add776c4b7 100644 (file)
--- a/bacula/src/filed/Makefile.in
+++ b/bacula/src/filed/Makefile.in
@@ -24,8 +24,6 @@ GETTEXT_LIBS = @LIBINTL@
 
 PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_INC = @PYTHON_INCDIR@
-AFS_CFLAGS = @AFS_CFLAGS@
-AFS_LIBS = @AFS_LIBS@
 
 first_rule: all
 dummy:
@@ -65,7 +63,7 @@ all: Makefile @WIN32@ bacula-fd @STATIC_FD@
 
 acl.o: acl.c
        @echo "Compiling $<"
-       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $(AFS_CFLAGS) $<
+       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
 win32/winlib.a:
        @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
@@ -96,12 +94,12 @@ bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../
        @echo "Linking $@ ..."
        $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
          $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
-         $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS)
+         $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
 
 static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
        $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
           $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
-          $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS)
+          $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
        strip $@
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status

diff --git a/bacula/src/filed/acl.c b/bacula/src/filed/acl.c
index e1bc855e4aa80f1c40ce6a4d4ff29fab160c67c2..cfe2c64be3311ef4c4cb0968bd21cfad9f80854d 100644 (file)
--- a/bacula/src/filed/acl.c
+++ b/bacula/src/filed/acl.c
@@ -38,8 +38,6 @@
  *   - Solaris (POSIX and NFSv4/ZFS acls)
  *   - Tru64
  *
- * Next to OS specific acls we support AFS acls using the pioctl interface.
- *
  * We handle two different types of ACLs: access and default ACLS.
  * On most systems that support default ACLs they only apply to directories.
  *
@@ -64,7 +62,7 @@
 #include "bacula.h"
 #include "filed.h"
   
-#if !defined(HAVE_ACL) && !defined(HAVE_AFS_ACL)
+#if !defined(HAVE_ACL)
 /**
  * Entry points when compiled without support for ACLs or on an unsupported platform.
  */