From 0eb96e07ed3098507232fdc57d899cffa8f1b27d Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Tue, 12 Feb 2013 23:09:01 -0500
Subject: [PATCH] Don't set pwmd's pinentry timeout for a remote connection.

---
 src/libpwmd.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/libpwmd.c b/src/libpwmd.c
index fec0e682..e94681cd 100644
--- a/src/libpwmd.c
+++ b/src/libpwmd.c
@@ -1343,7 +1343,11 @@ pwmd_setopt (pwm_t * pwm, pwmd_option_t opt, ...)
       else
 	pwm->pinentry_timeout = n;
 
+#if defined(WITH_SSH) || defined(WITH_GNUTLS)
+      if (!rc && pwm->fd != -1 && !pwm->tcp)
+#else
       if (!rc && pwm->fd != -1)
+#endif
 	rc = pwmd_command (pwm, NULL, NULL, NULL, NULL,
 			   "OPTION pinentry-timeout=%i", pwm->pinentry_timeout);
       break;
-- 
2.11.4.GIT