diff options
| author | Christian Göttsche <cgzones@googlemail.com> | 2024-01-03 16:11:44 +0100 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2024-01-08 20:59:23 +0000 |
| commit | cb9f88ba944d56c0b6c65be18500f7d56c9f514c (patch) | |
| tree | 1547488ed779cd4ad7e0ca6728204311c481db2a | |
| parent | dfc2532e84cadc9b2a489de9b8b1cd5fb6679fb3 (diff) | |
| download | pam-cb9f88ba944d56c0b6c65be18500f7d56c9f514c.tar.gz pam-cb9f88ba944d56c0b6c65be18500f7d56c9f514c.tar.bz2 pam-cb9f88ba944d56c0b6c65be18500f7d56c9f514c.zip | |
pam_unix: build unix_update only with SELinux enabled
The helper unix_update(8) is only called from code enabled when SELinux
support is enabled.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | modules/pam_unix/Makefile.am | 19 |
2 files changed, 17 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 44b37f5f..1d027a3f 100644 --- a/configure.ac +++ b/configure.ac @@ -528,6 +528,7 @@ fi AC_ARG_ENABLE([selinux], AS_HELP_STRING([--disable-selinux],[do not use SELinux]), WITH_SELINUX=$enableval, WITH_SELINUX=yes) +AM_CONDITIONAL([WITH_SELINUX], [test "$WITH_SELINUX" = "yes"]) if test "$WITH_SELINUX" = "yes" ; then AC_CHECK_LIB([selinux],[getfilecon], LIBSELINUX="-lselinux", LIBSELINUX="") else diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am index a1dfe44e..84e26d42 100644 --- a/modules/pam_unix/Makefile.am +++ b/modules/pam_unix/Makefile.am @@ -8,9 +8,17 @@ MAINTAINERCLEANFILES = $(MANS) README EXTRA_DIST = md5.c md5_crypt.c lckpwdf.-c yppasswd_xdr.c $(XMLS) CHANGELOG if HAVE_DOC -dist_man_MANS = pam_unix.8 unix_chkpwd.8 unix_update.8 +dist_man_MANS = pam_unix.8 unix_chkpwd.8 +if WITH_SELINUX +dist_man_MANS += unix_update.8 endif -XMLS = README.xml pam_unix.8.xml unix_chkpwd.8.xml unix_update.8.xml +endif + +XMLS = README.xml pam_unix.8.xml unix_chkpwd.8.xml +if WITH_SELINUX +XMLS += unix_update.8.xml +endif + dist_check_SCRIPTS = tst-pam_unix TESTS = $(dist_check_SCRIPTS) @@ -37,7 +45,10 @@ securelib_LTLIBRARIES = pam_unix.la noinst_HEADERS = md5.h support.h yppasswd.h bigcrypt.h passverify.h -sbin_PROGRAMS = unix_chkpwd unix_update +sbin_PROGRAMS = unix_chkpwd +if WITH_SELINUX +sbin_PROGRAMS += unix_update +endif noinst_PROGRAMS = bigcrypt @@ -58,11 +69,13 @@ unix_chkpwd_CFLAGS = $(AM_CFLAGS) @EXE_CFLAGS@ -DHELPER_COMPILE=\"unix_chkpwd\" unix_chkpwd_LDFLAGS = @EXE_LDFLAGS@ unix_chkpwd_LDADD = @LIBCRYPT@ @LIBSELINUX@ @LIBAUDIT@ +if WITH_SELINUX unix_update_SOURCES = unix_update.c md5_good.c md5_broken.c bigcrypt.c \ passverify.c unix_update_CFLAGS = $(AM_CFLAGS) @EXE_CFLAGS@ -DHELPER_COMPILE=\"unix_update\" unix_update_LDFLAGS = @EXE_LDFLAGS@ unix_update_LDADD = @LIBCRYPT@ @LIBSELINUX@ +endif if ENABLE_REGENERATE_MAN dist_noinst_DATA = README |