Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 86a1d6f4aa6d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 7174dcab9191
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 3, 2017

  1. pam_ssh_agent_auth: Re-allow multiple authorized keys files 

    This functionality was initially introduced in
3644f91 to fix
NixOS/nixos#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.
    Alexander Kirchhoff committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    3948891 View commit details
    Browse the repository at this point in the history

  2. 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
    @edolstra
    edolstra committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    7174dca View commit details
    Browse the repository at this point in the history