From 95cbf84564d30a771f51f76e03ce1edf4349fd20 Mon Sep 17 00:00:00 2001
From: Felipe Sateler <fsateler@gmail.com>
Date: Wed, 12 Oct 2016 11:20:46 -0300
Subject: systemd-user: add pam_unix account module

Otherwise systemd-user@ fails because systemd validates the account

Fixes: #4342
---
 src/login/systemd-user.m4 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4
index fe38b24fef..e33963b125 100644
--- a/src/login/systemd-user.m4
+++ b/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
-- 
cgit v1.2.3-54-g00ecf


From 651742d8ecd62d718080329fbba805bf364e6c25 Mon Sep 17 00:00:00 2001
From: Felipe Sateler <fsateler@gmail.com>
Date: Wed, 12 Oct 2016 11:56:27 -0300
Subject: build-sys: Allow disabling installation of pam config snippet

---
 DISTRO_PORTING | 3 +++
 Makefile.am    | 2 ++
 configure.ac   | 3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/DISTRO_PORTING b/DISTRO_PORTING
index 9f61bd6de6..51a244389d 100644
--- a/DISTRO_PORTING
+++ b/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
diff --git a/Makefile.am b/Makefile.am
index b09b0cf167..e740512f98 100644
--- a/Makefile.am
+++ b/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
diff --git a/configure.ac b/configure.ac
index ccd212ef13..0e87adc38f 100644
--- a/configure.ac
+++ b/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],
-- 
cgit v1.2.3-54-g00ecf