diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-20 13:32:39 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-20 13:32:39 +0000 |
| commit | 8c7859f7fb004016b5500bfd53c9a9fb15199f5e (patch) | |
| tree | cf7c53e304319b859dbf59df59dac25fb23dfaec | |
| parent | 0739332a6c173f1aed6db0fef48ed95361711235 (diff) | |
| download | nixpkgs-8c7859f7fb004016b5500bfd53c9a9fb15199f5e.tar nixpkgs-8c7859f7fb004016b5500bfd53c9a9fb15199f5e.tar.gz nixpkgs-8c7859f7fb004016b5500bfd53c9a9fb15199f5e.tar.bz2 nixpkgs-8c7859f7fb004016b5500bfd53c9a9fb15199f5e.tar.lz nixpkgs-8c7859f7fb004016b5500bfd53c9a9fb15199f5e.tar.xz nixpkgs-8c7859f7fb004016b5500bfd53c9a9fb15199f5e.tar.zst nixpkgs-8c7859f7fb004016b5500bfd53c9a9fb15199f5e.zip | |
* Make kdesktop_lock work by providing a PAM configuration for KDE
and making kcheckpass setuid root. svn path=/nixos/trunk/; revision=12166
| -rw-r--r-- | etc/default.nix | 1 | ||||
| -rw-r--r-- | etc/pam.d/kde | 4 | ||||
| -rw-r--r-- | system/system.nix | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/etc/default.nix b/etc/default.nix index 3a4e2bdecac..e9de343f9c3 100644 --- a/etc/default.nix +++ b/etc/default.nix @@ -243,6 +243,7 @@ import ../helpers/make-etc.nix { "useradd" "chsh" "xlock" + "kde" "common" "common-console" # shared stuff for interactive local sessions ] diff --git a/etc/pam.d/kde b/etc/pam.d/kde new file mode 100644 index 00000000000..50f3cc5ce60 --- /dev/null +++ b/etc/pam.d/kde @@ -0,0 +1,4 @@ +auth include common +account include common +password include common +session include common diff --git a/system/system.nix b/system/system.nix index 7a40ba7c885..9a2bda52963 100644 --- a/system/system.nix +++ b/system/system.nix @@ -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; |