From 63517eca1b829fad5b6b42a8a43cf9e508c86eb7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 12 Jun 2012 20:21:15 +0000
Subject: [PATCH] * Actually use the security.pam.enableSSHAgentAuth option.

  http://hydra.nixos.org/build/2698800

svn path=/nixos/trunk/; revision=34483
---
 modules/security/pam.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/security/pam.nix b/modules/security/pam.nix
index 963aef55999..4fab7febc71 100644
--- a/modules/security/pam.nix
+++ b/modules/security/pam.nix
@@ -74,7 +74,7 @@ let
           # Authentication management.
           ${optionalString rootOK
               "auth sufficient pam_rootok.so"}
-          ${optionalString sshAgentAuth
+          ${optionalString (config.security.pam.enableSSHAgentAuth && sshAgentAuth)
               "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys"}
           ${optionalString usbAuth
               "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"}