* Make kdesktop_lock work by providing a PAM configuration for KDE

and making kcheckpass setuid root.

svn path=/nixos/trunk/; revision=12166
This commit is contained in:
Eelco Dolstra 2008-06-20 13:32:39 +00:00
parent 0739332a6c
commit 8c7859f7fb
3 changed files with 8 additions and 2 deletions

View File

@ -243,6 +243,7 @@ import ../helpers/make-etc.nix {
"useradd"
"chsh"
"xlock"
"kde"
"common"
"common-console" # shared stuff for interactive local sessions
]

4
etc/pam.d/kde Normal file
View File

@ -0,0 +1,4 @@
auth include common
account include common
password include common
session include common

View File

@ -314,8 +314,9 @@ rec {
setuidPrograms =
config.security.setuidPrograms ++
config.security.extraSetuidPrograms ++
pkgs.lib.optional (config.security.sudo.enable) "sudo" ++
(if (config.services.atd.enable) then [ "at" "atq" "atrm" ] else []);
pkgs.lib.optional config.security.sudo.enable "sudo" ++
pkgs.lib.optionals config.services.atd.enable ["at" "atq" "atrm"] ++
pkgs.lib.optional (config.services.xserver.sessionType == "kde") "kcheckpass";
inherit (usersGroups) createUsersGroups usersList groupsList;