* Turn on pam_env for everything.

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

system/etc.nix

@@ -5,7 +5,7 @@ let
   optional = option: file:
     if config.get option then [file] else [];
 
-  defaultEnv = pkgs.writeText "environment" "
+  envConf = pkgs.writeText "environment" "
     PATH=${systemPath}/bin:${systemPath}/sbin
   ";
 
@@ -135,7 +135,7 @@ import ../helpers/make-etc.nix {
             then pkgs.pam_ldap
             else "/no-such-path";
           inherit (pkgs.xorg) xauth;
-          inherit defaultEnv;
+          inherit envConf;
         };
         target = "pam.d/" + program;
       }

system/etc/pam.d/common-session

@@ -1,2 +1,3 @@
 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/sshd

@@ -2,4 +2,3 @@ auth     include        common-auth
 account  include        common-account
 password include        common-password
 session  include        common-session
-session  optional       pam_env.so envfile=@defaultEnv@