From 2c41edd1bc5a6079fa301fddf74b8bf62b1d82f0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 30 Jan 2007 14:58:04 +0000
Subject: [PATCH] * Turn on pam_env for everything.

svn path=/nixos/trunk/; revision=7817
---
 system/etc.nix                  | 4 ++--
 system/etc/pam.d/common-session | 1 +
 system/etc/pam.d/sshd           | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/etc.nix b/system/etc.nix
index 029f651c5e20..953cdc96498f 100644
--- a/system/etc.nix
+++ b/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;
       }
diff --git a/system/etc/pam.d/common-session b/system/etc/pam.d/common-session
index 434fe930f77e..971774033f04 100644
--- a/system/etc/pam.d/common-session
+++ b/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@
diff --git a/system/etc/pam.d/sshd b/system/etc/pam.d/sshd
index e77a987ea2aa..c3fad16bbef3 100644
--- a/system/etc/pam.d/sshd
+++ b/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@