[svn] gpgme - r1422 - trunk/src

[svn author marcus]

Author: marcus
Date: 2009-11-09 22:17:58 +0100 (Mon, 09 Nov 2009)
New Revision: 1422

Modified:
   trunk/src/ChangeLog
   trunk/src/engine-gpgsm.c
Log:
2009-11-09  Marcus Brinkmann  <marcus at g10code.de>

	* engine-gpgsm.c (gpgsm_new): Close server side FDs.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-11-06 00:44:44 UTC (rev 1421)
+++ trunk/src/ChangeLog	2009-11-09 21:17:58 UTC (rev 1422)
@@ -1,3 +1,7 @@
+2009-11-09  Marcus Brinkmann  <marcus at g10code.de>
+
+	* engine-gpgsm.c (gpgsm_new): Close server side FDs.
+
 2009-11-06  Marcus Brinkmann  <marcus at g10code.de>
 
 	* gpgme-tool.c (struct gpgme_tool): New members write_data and

Modified: trunk/src/engine-gpgsm.c
===================================================================
--- trunk/src/engine-gpgsm.c	2009-11-06 00:44:44 UTC (rev 1421)
+++ trunk/src/engine-gpgsm.c	2009-11-09 21:17:58 UTC (rev 1422)
@@ -364,9 +364,9 @@
 
   /* assuan_pipe_connect in this case uses _gpgme_io_spawn which
      closes the child fds for us.  */
-  gpgsm->input_cb.server_fd = -1;
-  gpgsm->output_cb.server_fd = -1;
-  gpgsm->message_cb.server_fd = -1;
+  _gpgme_io_close (gpgsm->input_cb.server_fd);
+  _gpgme_io_close (gpgsm->output_cb.server_fd);
+  _gpgme_io_close (gpgsm->message_cb.server_fd);
 
   err = _gpgme_getenv ("DISPLAY", &dft_display);
   if (err)