aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2004-04-26 18:26:41 +0000
committerWerner Koch <[email protected]>2004-04-26 18:26:41 +0000
commitd74d2f5bc90dfeefae65bed9e4bad5a6dd3d9e44 (patch)
treee78fce7ffcdfd8c851df8ab387bafa4781e69338
parent* scdaemon.c (main): Do the last change the usual way. This is so (diff)
downloadgnupg-d74d2f5bc90dfeefae65bed9e4bad5a6dd3d9e44.tar.gz
gnupg-d74d2f5bc90dfeefae65bed9e4bad5a6dd3d9e44.zip
(start_scd): Do not register an event signal if we
are running as a pipe server.
-rw-r--r--agent/ChangeLog5
-rw-r--r--agent/call-scd.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog
index f63ae88a1..10674ad18 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-26 Werner Koch <[email protected]>
+
+ * call-scd.c (start_scd): Do not register an event signal if we
+ are running as a pipe server.
+
2004-04-21 Werner Koch <[email protected]>
* call-scd.c (start_scd): Send event-signal option. Always check
diff --git a/agent/call-scd.c b/agent/call-scd.c
index 3c2bf9e2a..2427d8ca3 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -270,7 +270,10 @@ start_scd (ctrl_t ctrl)
if (DBG_ASSUAN)
log_debug ("connection to SCdaemon established\n");
- /* Tell the scdaemon that we want him to send us an event signal. */
+ /* Tell the scdaemon that we want him to send us an event signal.
+ But only do this if we are running as a regular sever and not
+ simply as a pipe server. */
+ if (ctrl->connection_fd != -1)
{
char buf[100];