Merge pull request #4358 from fsateler/pam-config

Pam config fixes

DISTRO_PORTING

@@ -48,6 +48,9 @@ PAM:
         /etc/security/limits.conf will not be read unless you load pam_limits.
         Make sure you add modules your distro expects from user services.
 
+        Pass --with-pamconfdir=no to ./configure to avoid installing this file
+        and instead install your own.
+
 CONTRIBUTING UPSTREAM:
 
         We generally do no longer accept distribution-specific

Makefile.am

@@ -5902,8 +5902,10 @@ pam_systemd_la_LIBADD = \
 pamlib_LTLIBRARIES = \
 	pam_systemd.la
 
+if ENABLE_PAM_CONFIG
 dist_pamconf_DATA = \
 	src/login/systemd-user
+endif
 
 EXTRA_DIST += \
 	src/login/systemd-user.m4

configure.ac

@@ -1507,9 +1507,10 @@ AC_ARG_WITH([pamlibdir],
 AX_NORMALIZE_PATH([with_pamlibdir])
 
 AC_ARG_WITH([pamconfdir],
-        AS_HELP_STRING([--with-pamconfdir=DIR], [Directory for PAM configuration]),
+        AS_HELP_STRING([--with-pamconfdir=DIR], [Directory for PAM configuration (pass no to disable installing)]),
         [],
         [with_pamconfdir=${sysconfdir}/pam.d])
+AM_CONDITIONAL(ENABLE_PAM_CONFIG, [test "$with_pamconfdir" != "no"])
 AX_NORMALIZE_PATH([with_pamconfdir])
 
 AC_ARG_ENABLE([split-usr],

src/login/systemd-user.m4

@@ -2,6 +2,8 @@
 #
 # Used by systemd --user instances.
 
+account required pam_unix.so
+
 m4_ifdef(`HAVE_SELINUX',
 session  required pam_selinux.so close
 session  required pam_selinux.so nottys open