* Merge the common-* files.

svn path=/nixos/trunk/; revision=7818

system/etc.nix

@@ -148,10 +148,7 @@ import ../helpers/make-etc.nix {
       "shadow"
       "sshd"
       "useradd"
-      "common-auth"
+      "common"
-      "common-account"
-      "common-password"
-      "common-session"
     ]
   );
 }

system/etc/pam.d/common

@@ -0,0 +1,13 @@
+auth     sufficient     @pam_ldap@/lib/security/pam_ldap.so 
+auth     sufficient     @pam_unix2@/lib/security/pam_unix2.so
+auth     required       pam_deny.so
+
+account  optional       @pam_ldap@/lib/security/pam_ldap.so 
+account  required       @pam_unix2@/lib/security/pam_unix2.so
+
+password sufficient     @pam_ldap@/lib/security/pam_ldap.so 
+password sufficient     @pam_unix2@/lib/security/pam_unix2.so nullok
+
+session  optional       @pam_ldap@/lib/security/pam_ldap.so 
+session  required       @pam_unix2@/lib/security/pam_unix2.so
+session  optional       pam_env.so envfile=@envConf@

system/etc/pam.d/common-account

@@ -1,2 +0,0 @@
-account  optional       @pam_ldap@/lib/security/pam_ldap.so 
-account  required       @pam_unix2@/lib/security/pam_unix2.so

system/etc/pam.d/common-auth

@@ -1,3 +0,0 @@
-auth     sufficient     @pam_ldap@/lib/security/pam_ldap.so 
-auth     sufficient     @pam_unix2@/lib/security/pam_unix2.so
-auth     required       pam_deny.so

system/etc/pam.d/common-password

@@ -1,2 +0,0 @@
-password sufficient     @pam_ldap@/lib/security/pam_ldap.so 
-password sufficient     @pam_unix2@/lib/security/pam_unix2.so nullok

system/etc/pam.d/common-session

@@ -1,3 +0,0 @@
-auth     optional       @pam_ldap@/lib/security/pam_ldap.so 
-session  required       @pam_unix2@/lib/security/pam_unix2.so
-session  optional       pam_env.so envfile=@envConf@

system/etc/pam.d/login

@@ -1,4 +1,4 @@
-auth     include        common-auth
+auth     include        common
-account  include        common-account
+account  include        common
-password include        common-password
+password include        common
-session  include        common-session
+session  include        common

system/etc/pam.d/passwd

@@ -1,4 +1,4 @@
-auth     include        common-auth
+auth     include        common
-account  include        common-account
+account  include        common
-password include        common-password
+password include        common
-session  include        common-session
+session  include        common

system/etc/pam.d/sshd

@@ -1,4 +1,4 @@
-auth     include        common-auth
+auth     include        common
-account  include        common-account
+account  include        common
-password include        common-password
+password include        common
-session  include        common-session
+session  include        common

system/etc/pam.d/su

@@ -1,6 +1,6 @@
 auth     sufficient     pam_rootok.so
-auth     include        common-auth
+auth     include        common
-account  include        common-account
+account  include        common
-password include        common-password
+password include        common
-session  include        common-session
+session  include        common
 session  optional       pam_xauth.so xauthpath=@xauth@/bin/xauth systemuser=99