diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | modules/Makefile.am | 6 | ||||
| -rw-r--r-- | modules/pam_namespace/Makefile.am | 20 |
3 files changed, 14 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index f3ef8372..cfcc622a 100644 --- a/configure.ac +++ b/configure.ac @@ -578,7 +578,6 @@ AC_CHECK_FUNCS([logwtmp]) LIBS=$BACKUP_LIBS AC_CHECK_FUNCS(unshare, [UNSHARE=yes], [UNSHARE=no]) -AM_CONDITIONAL([HAVE_UNSHARE], [test "$UNSHARE" = yes]) AC_ARG_ENABLE([regenerate-docu], AS_HELP_STRING([--disable-regenerate-docu],[Don't re-build documentation from XML sources]), @@ -658,6 +657,7 @@ AC_DEFINE_UNQUOTED(PAM_USERTYPE_OVERFLOW_UID, $opt_kerneloverflowuid, [Kernel ov AM_CONDITIONAL([COND_BUILD_PAM_CRACKLIB], [test -n "$LIBCRACK"]) AM_CONDITIONAL([COND_BUILD_PAM_KEYINIT], [test "$have_key_syscalls" = 1]) AM_CONDITIONAL([COND_BUILD_PAM_LASTLOG], [test "$ac_cv_func_logwtmp" = yes]) +AM_CONDITIONAL([COND_BUILD_PAM_NAMESPACE], [test "$UNSHARE" = yes]) AM_CONDITIONAL([COND_BUILD_PAM_RHOSTS], [test "$ac_cv_func_ruserok_af" = yes -o "$ac_cv_func_ruserok" = yes]) AM_CONDITIONAL([COND_BUILD_PAM_SETQUOTA], [test "$ac_cv_func_quotactl" = yes]) AM_CONDITIONAL([COND_BUILD_PAM_TTY_AUDIT], [test "$HAVE_AUDIT_TTY_STATUS" = yes]) diff --git a/modules/Makefile.am b/modules/Makefile.am index 3ba750cd..233c69db 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -14,6 +14,10 @@ if COND_BUILD_PAM_LASTLOG MAYBE_PAM_LASTLOG = pam_lastlog endif +if COND_BUILD_PAM_NAMESPACE + MAYBE_PAM_NAMESPACE = pam_namespace +endif + if COND_BUILD_PAM_RHOSTS MAYBE_PAM_RHOSTS = pam_rhosts endif @@ -52,7 +56,7 @@ SUBDIRS := \ pam_mail \ pam_mkhomedir \ pam_motd \ - pam_namespace \ + $(MAYBE_PAM_NAMESPACE) \ pam_nologin \ pam_permit \ pam_pwhistory \ diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am index d3ad23d4..7f75ff28 100644 --- a/modules/pam_namespace/Makefile.am +++ b/modules/pam_namespace/Makefile.am @@ -13,10 +13,8 @@ endif EXTRA_DIST = README namespace.conf namespace.init $(MANS) $(XMLS) tst-pam_namespace -if HAVE_UNSHARE - TESTS = tst-pam_namespace - man_MANS = $(MAN5) $(MAN8) -endif +TESTS = tst-pam_namespace +man_MANS = $(MAN5) $(MAN8) XMLS = README.xml namespace.conf.5.xml pam_namespace.8.xml pam_namespace_helper.8.xml @@ -34,24 +32,22 @@ endif noinst_HEADERS = md5.h pam_namespace.h argv_parse.h -if HAVE_UNSHARE - securelib_LTLIBRARIES = pam_namespace.la - pam_namespace_la_SOURCES = pam_namespace.c md5.c argv_parse.c - pam_namespace_la_LIBADD = $(top_builddir)/libpam/libpam.la @LIBSELINUX@ +securelib_LTLIBRARIES = pam_namespace.la +pam_namespace_la_SOURCES = pam_namespace.c md5.c argv_parse.c +pam_namespace_la_LIBADD = $(top_builddir)/libpam/libpam.la @LIBSELINUX@ - secureconf_DATA = namespace.conf - secureconf_SCRIPTS = namespace.init +secureconf_DATA = namespace.conf +secureconf_SCRIPTS = namespace.init install-data-local: mkdir -p $(DESTDIR)$(namespaceddir) mkdir -p $(DESTDIR)$(servicedir) $(INSTALL_DATA) pam_namespace.service $(DESTDIR)$(servicedir) - sbin_SCRIPTS = pam_namespace_helper +sbin_SCRIPTS = pam_namespace_helper uninstall-local: -rm $(DESTDIR)$(servicedir)/pam_namespace.service -endif if ENABLE_REGENERATE_MAN |