configure.ac: Drop libattr linking

The libattr dependency is no longer needed.

Reviewed-by: Alejandro Colomar <alx@kernel.org>
Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>

diff --git a/configure.ac b/configure.ac
index b3dd34d96d234a9fcfb1db54e2ad3c378d3f3d57..13213932ad68fd78130a20f93487ce366e7c6d49 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -408,32 +408,6 @@ if test "$with_acl" != "no"; then
        fi
 fi
 
-AC_SUBST([LIBATTR])
-if test "$with_attr" != "no"; then
-       AC_CHECK_HEADERS([attr/libattr.h attr/error_context.h], [attr_header="yes"], [attr_header="no"])
-       if test "X$attr_header$with_attr" = "noyes" ; then
-               AC_MSG_ERROR([attr/libattr.h or attr/error_context.h is missing])
-       elif test "X$attr_header" = "Xyes" ; then
-               AC_CHECK_LIB([attr], [attr_copy_file],
-                            [AC_CHECK_LIB([attr], [attr_copy_fd],
-                                          [attr_lib="yes"],
-                                          [attr_lib="no"])],
-                            [attr_lib="no"])
-               if test "X$attr_lib$with_attr" = "Xnoyes" ; then
-                       AC_MSG_ERROR([libattr not found])
-               elif test "X$attr_lib" = "Xno" ; then
-                       with_attr="no"
-               else
-                       AC_DEFINE([WITH_ATTR], [1],
-                                 [Build shadow with Extended Attributes support])
-                       LIBATTR="-lattr"
-                       with_attr="yes"
-               fi
-       else
-               with_attr="no"
-       fi
-fi
-
 AC_SUBST([LIBAUDIT])
 if test "$with_audit" != "no"; then
        AC_CHECK_HEADER([libaudit.h], [audit_header="yes"], [audit_header="no"])

diff --git a/lib/copydir.c b/lib/copydir.c
index 11fcf311837f468152655b96d527e1ec96bf7669..f04cd51b11a1f38b391db708e471638d257d9402 100644 (file)
--- a/lib/copydir.c
+++ b/lib/copydir.c
@@ -27,16 +27,11 @@
 #ifdef WITH_SELINUX
 #include <selinux/selinux.h>
 #endif                         /* WITH_SELINUX */
-#if defined(WITH_ACL) || defined(WITH_ATTR)
+#if defined(WITH_ACL)
 #include <stdarg.h>
 #include <attr/error_context.h>
-#endif                         /* WITH_ACL || WITH_ATTR */
-#ifdef WITH_ACL
 #include <acl/libacl.h>
 #endif                         /* WITH_ACL */
-#ifdef WITH_ATTR
-#include <attr/libattr.h>
-#endif                         /* WITH_ATTR */
 #include "shadowlog.h"
 #include "string/sprintf/aprintf.h"
 #include "string/strcmp/streq.h"
@@ -90,7 +85,7 @@ static int fchown_if_needed (int fdst, const struct stat *statp,
                              uid_t old_uid, uid_t new_uid,
                              gid_t old_gid, gid_t new_gid);
 
-#if defined(WITH_ACL) || defined(WITH_ATTR)
+#if defined(WITH_ACL)
 /*
  * error_acl - format the error messages for the ACL and EQ libraries.
  */
@@ -120,7 +115,7 @@ error_acl(struct error_context *, const char *fmt, ...)
 static struct error_context ctx = {
        error_acl, NULL, NULL
 };
-#endif                         /* WITH_ACL || WITH_ATTR */
+#endif                         /* WITH_ACL */
 
 #ifdef WITH_ACL
 static int perm_copy_path(const struct path_info *src,

diff --git a/libsubid/Makefile.am b/libsubid/Makefile.am
index b6488e779d7495612ad2c7adcfe282c99534a09e..20364d438940e70437f0c208c9b4711f12936a76 100644 (file)
--- a/libsubid/Makefile.am
+++ b/libsubid/Makefile.am
@@ -14,7 +14,6 @@ MISCLIBS = \
        $(LIBECONF) \
        $(LIBCRYPT) \
        $(LIBACL) \
-       $(LIBATTR) \
        $(LIBTCB) \
        $(LIBPAM)
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 6981815095314e07fa55f4097fe12fcda5af0bfb..ed0802cd131886fcaaff5ae1e94b7087a788bbe4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -132,9 +132,9 @@ su_SOURCES     = \
        suauth.c
 su_LDADD       = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBCRYPT_NOPAM) $(LIBSKEY) $(LIBMD) $(LIBECONF) $(LIBSELINUX)
 sulogin_LDADD  = $(LDADD) $(LIBCRYPT) $(LIBECONF)
-useradd_LDADD  = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBECONF) -ldl
+useradd_LDADD  = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBECONF) -ldl
 userdel_LDADD  = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBECONF) -ldl
-usermod_LDADD  = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBATTR) $(LIBECONF) -ldl
+usermod_LDADD  = $(LDADD) $(LIBPAM_SUID) $(LIBAUDIT) $(LIBSELINUX) $(LIBSEMANAGE) $(LIBACL) $(LIBECONF) -ldl
 vipw_LDADD     = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBECONF)
 
 install-am: all-am