diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-08-13 14:07:34 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-08-13 14:07:34 +0000 |
| commit | f0eb823a34f103bceef4b6fcf0406634b08f937d (patch) | |
| tree | ef604ca26fe8949b721dc686e8b2d2c8a4a8a7bd /modules/security | |
| parent | cfb465c7a548b044d7e874dacce5600fff7c390f (diff) | |
| download | nixpkgs-f0eb823a34f103bceef4b6fcf0406634b08f937d.tar nixpkgs-f0eb823a34f103bceef4b6fcf0406634b08f937d.tar.gz nixpkgs-f0eb823a34f103bceef4b6fcf0406634b08f937d.tar.bz2 nixpkgs-f0eb823a34f103bceef4b6fcf0406634b08f937d.tar.lz nixpkgs-f0eb823a34f103bceef4b6fcf0406634b08f937d.tar.xz nixpkgs-f0eb823a34f103bceef4b6fcf0406634b08f937d.tar.zst nixpkgs-f0eb823a34f103bceef4b6fcf0406634b08f937d.zip | |
Add unix_chkpwd suid wrapper
svn path=/nixos/trunk/; revision=23165
Diffstat (limited to 'modules/security')
| -rw-r--r-- | modules/security/pam.nix | 12 | ||||
| -rw-r--r-- | modules/security/setuid-wrappers.nix | 3 |
2 files changed, 12 insertions, 3 deletions
diff --git a/modules/security/pam.nix b/modules/security/pam.nix index 5c59282fe8a..a5491792f7e 100644 --- a/modules/security/pam.nix +++ b/modules/security/pam.nix @@ -191,7 +191,7 @@ in ###### implementation config = { - + environment.systemPackages = # Include the PAM modules in the system path mostly for the manpages. [ pkgs.pam ] @@ -205,6 +205,14 @@ in target = "pam.d/other"; }; + security.setuidOwners = [ { + program = "unix_chkpwd"; + source = "${pkgs.pam}/sbin/unix_chkpwd.orig"; + owner = "root"; + setuid = true; + } ]; + + security.pam.services = # Most of these should be moved to specific modules. [ { name = "cups"; } @@ -217,5 +225,5 @@ in ]; }; - + } diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix index a7513477353..3c4a08c16b7 100644 --- a/modules/security/setuid-wrappers.nix +++ b/modules/security/setuid-wrappers.nix @@ -62,7 +62,8 @@ in default = "/var/setuid-wrappers"; description = '' This option defines the path to the setuid wrappers. It - should generally not be overriden. + should generally not be overriden. Some packages in nixpkgs rely on + wrapperDir == /var/setuid-wrappers ''; }; |