dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* SLiM / ConsoleKit compatibility hack.

Browse Source 
svn path=/nixos/trunk/; revision=16744
This commit is contained in:
Eelco Dolstra 2009-08-17 01:35:48 +00:00
parent 7ab616f659
commit 447c1ac34a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/security/pam.nix
View File

@ -29,6 +29,8 @@ let
, # If set, this is a local login (e.g. virtual console or X), so , # If set, this is a local login (e.g. virtual console or X), so
# the user gets ownership of audio devices etc. # the user gets ownership of audio devices etc.
localLogin ? false localLogin ? false
, # Temporary hack to get SLiM to work with ConsoleKit.
ckHack ? false
, # Whether to forward XAuth keys between users. Mostly useful , # Whether to forward XAuth keys between users. Mostly useful
# for "su". # for "su".
forwardXAuth ? false forwardXAuth ? false
@ -63,11 +65,10 @@ let
${optionalString config.users.ldap.enable ${optionalString config.users.ldap.enable
"session optional ${pam_ldap}/lib/security/pam_ldap.so"} "session 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
${optionalString ckHack
"session required pam_env.so debug conffile=${envFile} readenv=0"}
${optionalString localLogin ${optionalString localLogin
'' "session optional ${pkgs.console_kit}/lib/security/pam_ck_connector.so"}
session required pam_env.so debug conffile=${envFile} readenv=0
session optional ${pkgs.console_kit}/lib/security/pam_ck_connector.so debug
''}
${optionalString forwardXAuth ${optionalString forwardXAuth
"session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"} "session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"}
''; '';

2
modules/services/x11/xserver/display-managers/slim.nix
View File

@ -105,7 +105,7 @@ in
execCmd = "${pkgs.slim}/bin/slim"; execCmd = "${pkgs.slim}/bin/slim";
}; };
security.pam.services = [ { name = "slim"; localLogin = true; } ]; security.pam.services = [ { name = "slim"; localLogin = true; ckHack = true; } ];
}; };