[gentoo-commits] proj/pambase:master commit in: /

["Samuli Suominen" <ssuominen@gentoo.org>]

commit:     c1058bd8ccde0c56454a48339e9afb7a6e7fa80f
Author:     Samuli Suominen <ssuominen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 13 13:52:27 2014 +0000
Commit:     Samuli Suominen <ssuominen <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 13:52:27 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pambase.git;a=commit;h=c1058bd8

Import -systemd.patch and -systemd-auth.patch from gentoo-x86, see both bugs #372229 and #485470

---
 Makefile       | 4 ++++
 system-auth.in | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/Makefile b/Makefile
index 7d3e22a..ec5d240 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,10 @@ ifeq "$(CONSOLEKIT)" "yes"
 PAMFLAGS += -DHAVE_CONSOLEKIT=1
 endif
 
+ifeq "$(SYSTEMD)" "yes"
+PAMFLAGS += -DHAVE_SYSTEMD=1
+endif
+
 ifeq "$(GNOME_KEYRING)" "yes"
 PAMFLAGS += -DHAVE_GNOME_KEYRING=1
 endif

diff --git a/system-auth.in b/system-auth.in
index a80d653..43df701 100644
--- a/system-auth.in
+++ b/system-auth.in
@@ -35,3 +35,7 @@ password	optional	pam_permit.so
 session		optional	pam_ssh.so
 #endif
 #include "system-session.inc"
+
+#if HAVE_SYSTEMD
+-session        optional        pam_systemd.so
+#endif