public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Turn on pam_env for everything.

Browse Source 
svn path=/nixos/trunk/; revision=7817
This commit is contained in:
Eelco Dolstra 2007-01-30 14:58:04 +00:00
parent b0b776c04a
commit 2c41edd1bc
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
system/etc.nix
View File

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

1
system/etc/pam.d/common-session
View File

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

1
system/etc/pam.d/sshd
View File

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