fuix pam configs

5 files changed, 16 insertions, 16 deletions

diff --git a/remote/modules/pam/data/etc/pam.d/kdm b/remote/modules/pam/data/etc/pam.d/kdm
index ed7c45ac..11b5f1fc 100644
--- a/remote/modules/pam/data/etc/pam.d/kdm
+++ b/remote/modules/pam/data/etc/pam.d/kdm
@@ -4,8 +4,8 @@
 auth       required     pam_nologin.so
 auth       required     pam_env.so readenv=1
 auth       required     pam_env.so readenv=1 envfile=/etc/default/locale
-@include common-auth
+auth include common-auth
 session    required     pam_limits.so
-@include common-account
-@include common-password
-@include common-session
+account include common-account
+password include common-password
+session include common-session
diff --git a/remote/modules/pam/data/etc/pam.d/kdm-np b/remote/modules/pam/data/etc/pam.d/kdm-np
index a13232b9..8c1a2a81 100644
--- a/remote/modules/pam/data/etc/pam.d/kdm-np
+++ b/remote/modules/pam/data/etc/pam.d/kdm-np
@@ -5,7 +5,7 @@ auth       required     pam_nologin.so
 auth       required     pam_env.so readenv=1
 auth       required     pam_env.so readenv=1 envfile=/etc/default/locale
 session    required     pam_limits.so
-@include common-account
-@include common-password
-@include common-session
+account include common-account
+password include common-password
+session include common-session
 auth       required     pam_permit.so
diff --git a/remote/modules/pam/data/etc/pam.d/login b/remote/modules/pam/data/etc/pam.d/login
index 50576aaa..561c71df 100644
--- a/remote/modules/pam/data/etc/pam.d/login
+++ b/remote/modules/pam/data/etc/pam.d/login
@@ -53,7 +53,7 @@ session       required   pam_env.so readenv=1
 session       required   pam_env.so readenv=1 envfile=/etc/default/locale
 
 # Standard Un*x authentication.
-@include common-auth
+auth include common-auth
 
 # TODO do we need this?
 # This allows certain extra groups to be granted to a user
@@ -88,9 +88,9 @@ session    optional   pam_lastlog.so
 session    optional   pam_motd.so
 
 # Standard Un*x account and session
-@include common-account
-@include common-session
-@include common-password
+account include common-account
+session include common-session
+password include common-password
 
 # SELinux needs to intervene at login time to ensure that the process
 # starts in the proper default security context. Only sessions which are
diff --git a/remote/modules/pam/data/etc/pam.d/passwd b/remote/modules/pam/data/etc/pam.d/passwd
index 5872e7bd..32eaa3c6 100644
--- a/remote/modules/pam/data/etc/pam.d/passwd
+++ b/remote/modules/pam/data/etc/pam.d/passwd
@@ -2,5 +2,5 @@
 # The PAM configuration file for the Shadow `passwd' service
 #
 
-@include common-password
+password include common-password
 
diff --git a/remote/modules/pam/data/etc/pam.d/sshd b/remote/modules/pam/data/etc/pam.d/sshd
index 40d998ae..8954d639 100644
--- a/remote/modules/pam/data/etc/pam.d/sshd
+++ b/remote/modules/pam/data/etc/pam.d/sshd
@@ -8,7 +8,7 @@ auth       required     pam_env.so # [1]
 auth       required     pam_env.so envfile=/etc/default/locale
 
 # Standard Un*x authentication.
-@include common-auth
+auth include common-auth
 
 # Disallow non-root logins when /etc/nologin exists.
 account    required     pam_nologin.so
@@ -18,10 +18,10 @@ account    required     pam_nologin.so
 # account  required     pam_access.so
 
 # Standard Un*x authorization.
-@include common-account
+account include common-account
 
 # Standard Un*x session setup and teardown.
-@include common-session
+session include common-session
 
 # Print the message of the day upon successful login.
 session    optional     pam_motd.so # [1]
@@ -38,4 +38,4 @@ session    optional     pam_motd.so # [1]
 # session  required     pam_selinux.so multiple
 
 # Standard Un*x password updating.
-@include common-password
+password include common-password