summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--factory/etc/pam.d/other15
-rw-r--r--factory/etc/pam.d/system-auth13
-rw-r--r--src/login/systemd-user12
3 files changed, 22 insertions, 18 deletions
diff --git a/factory/etc/pam.d/other b/factory/etc/pam.d/other
index 5b1a81f599..c1f729659c 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 0000000000..5b1a81f599
--- /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 7b57dbf784..8112d74640 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