aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2011-12-16 00:07:56 +0000
committerNIIBE Yutaka <[email protected]>2011-12-16 00:09:41 +0000
commitf6251c0d0af92331388f5e9bcd1750cbadcaca8f (patch)
tree7d5c87a2f540ecd391ea8fc06de7859af1303e5b
parentMerge fix for issue 1331 from 1.4. (diff)
downloadgnupg-f6251c0d0af92331388f5e9bcd1750cbadcaca8f.tar.gz
gnupg-f6251c0d0af92331388f5e9bcd1750cbadcaca8f.zip
Don't kill pinentry by SIGKILL but let it quit by SIGINT.
* agent/call-pinentry.c (agent_popup_message_stop): To pinentry, send SIGINT (was: SIGKILL).
-rw-r--r--agent/call-pinentry.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index d0cfd2b79..36093bb8b 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -1273,8 +1273,7 @@ agent_popup_message_stop (ctrl_t ctrl)
assuan_set_flag (entry_ctx, ASSUAN_NO_WAITPID, 1);
}
else if (pid > 0)
- kill (pid, SIGKILL); /* Need to use SIGKILL due to bad
- interaction of SIGINT with Pth. */
+ kill (pid, SIGINT);
#endif
/* Now wait for the thread to terminate. */