From: Kay Sievers <kay@vrfy.org>
Date: Tue, 29 Jul 2014 11:01:51 +0000 (+0200)
Subject: login: update systemd-user PAM configuration file
X-Git-Tag: v216~407
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=32767cb1e86d8e95a2ae215d9442536003551f6e;hp=3a43da2832dc5360a638d043f469a6dcbe025582;ds=inline

login: update systemd-user PAM configuration file
---

diff --git a/factory/etc/pam.d/other b/factory/etc/pam.d/other
index 5b1a81f59..c1f729659 100644
--- a/factory/etc/pam.d/other
+++ b/factory/etc/pam.d/other
@@ -1,13 +1,6 @@
 # This file is part of systemd.
 
-auth     sufficient pam_unix.so nullok try_first_pass
-
-account  required   pam_nologin.so
-account  sufficient pam_unix.so
-
-password sufficient pam_unix.so nullok sha512 shadow try_first_pass try_authtok
-
--session optional   pam_loginuid.so
--session optional   pam_systemd.so
-session  required   pam_limits.so
-session  sufficient pam_unix.so
+auth     include system-auth
+account  include system-auth
+password include system-auth
+session  include system-auth
diff --git a/factory/etc/pam.d/system-auth b/factory/etc/pam.d/system-auth
new file mode 100644
index 000000000..5b1a81f59
--- /dev/null
+++ b/factory/etc/pam.d/system-auth
@@ -0,0 +1,13 @@
+# This file is part of systemd.
+
+auth     sufficient pam_unix.so nullok try_first_pass
+
+account  required   pam_nologin.so
+account  sufficient pam_unix.so
+
+password sufficient pam_unix.so nullok sha512 shadow try_first_pass try_authtok
+
+-session optional   pam_loginuid.so
+-session optional   pam_systemd.so
+session  required   pam_limits.so
+session  sufficient pam_unix.so
diff --git a/src/login/systemd-user b/src/login/systemd-user
index 7b57dbf78..8112d7464 100644
--- a/src/login/systemd-user
+++ b/src/login/systemd-user
@@ -1,8 +1,6 @@
-#%PAM-1.0
+# This file is part of systemd.
+#
+# Used by systemd --user instances.
 
-# Used by systemd when launching systemd user instances.
-
-account include system-auth
-session include system-auth
-auth required pam_deny.so
-password required pam_deny.so
+account  include system-auth
+session  include system-auth