Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 39488911128ad5d5df0b549baf53840dedfc6d21
https://github.com/NixOS/nixpkgs/commit/39488911128ad5d5df0b549baf53840dedfc6d21
Author: Alexander Kirchhoff <ki...@cs.washington.edu>
Date: 2017-03-03 (Fri, 03 Mar 2017)
Changed paths:
M pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
A pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch
Log Message:
-----------
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.
Commit: 7174dcab9191a8a63ffef57c1a8781abf70f3d25
https://github.com/NixOS/nixpkgs/commit/7174dcab9191a8a63ffef57c1a8781abf70f3d25
Author: Eelco Dolstra <eelco.dols...@logicblox.com>
Date: 2017-03-03 (Fri, 03 Mar 2017)
Changed paths:
M pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
A pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch
Log Message:
-----------
Merge pull request #23435 from
sometimes-i-send-pull-requests/pam_ssh_agent_auth-multiple-authorized-keys-files
pam_ssh_agent_auth: Re-allow multiple authorized keys files
Compare: https://github.com/NixOS/nixpkgs/compare/86a1d6f4aa6d...7174dcab9191_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
