Browse Source

* SLiM / ConsoleKit compatibility hack.

svn path=/nixos/trunk/; revision=16744
nsd-state-dir
Eelco Dolstra 13 years ago
parent
commit
447c1ac34a
  1. 9
      modules/security/pam.nix
  2. 2
      modules/services/x11/xserver/display-managers/slim.nix

9
modules/security/pam.nix

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

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

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

Loading…
Cancel
Save