diff options
author | Alexander Kirchhoff <kirch@cs.washington.edu> | 2017-03-03 00:17:01 -0800 |
---|---|---|
committer | Alexander Kirchhoff <kirch@cs.washington.edu> | 2017-03-03 01:11:53 -0800 |
commit | 39488911128ad5d5df0b549baf53840dedfc6d21 (patch) | |
tree | a9e8839d127af1cffe79cc7d2891105dc21d2b77 /pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix | |
parent | 3f116702cc1242e34d008a8f1793e6f542e79472 (diff) | |
download | nixlib-39488911128ad5d5df0b549baf53840dedfc6d21.tar nixlib-39488911128ad5d5df0b549baf53840dedfc6d21.tar.gz nixlib-39488911128ad5d5df0b549baf53840dedfc6d21.tar.bz2 nixlib-39488911128ad5d5df0b549baf53840dedfc6d21.tar.lz nixlib-39488911128ad5d5df0b549baf53840dedfc6d21.tar.xz nixlib-39488911128ad5d5df0b549baf53840dedfc6d21.tar.zst nixlib-39488911128ad5d5df0b549baf53840dedfc6d21.zip |
pam_ssh_agent_auth: Re-allow multiple authorized keys files
This functionality was initially introduced in 3644f9124aaf35f2ad7b17cd05df19226d4e4d1c to fix https://github.com/NixOS/nixos/pull/52, but was broken in the update from 0.9.5 to 0.10.3. The original patch does not cleanly apply due to reformatting and parameter changes upstream, but the adaptations of the patch to the new version are not too severe.
Diffstat (limited to 'pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix index 9ce1ef6ae53d..48c02be9c389 100644 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix @@ -8,6 +8,12 @@ stdenv.mkDerivation rec { sha256 = "0qx78x7nvqdscyp04hfijl4rgyf64xy03prr28hipvgasrcd6lrw"; }; + patches = + [ # Allow multiple colon-separated authorized keys files to be + # specified in the file= option. + ./multiple-key-files.patch + ]; + buildInputs = [ pam openssl perl ]; enableParallelBuilding = true; |