2002-04-27 Marcus Brinkmann <marcus@g10code.de>

	* engine-gpgsm.c (_gpgme_gpgsm_op_verify): Close the output
	descriptor only when we don't need it anymore.  Close the message
	descriptor if we don't need it.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index f2a9235b52c75b6609a31a2225c4140393be886c..cfcdb8dae6c33dce0da83b18e3647b05ee068607 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-27  Marcus Brinkmann  <marcus@g10code.de>
+
+       * engine-gpgsm.c (_gpgme_gpgsm_op_verify): Close the output
+       descriptor only when we don't need it anymore.  Close the message
+       descriptor if we don't need it.
+
 2002-04-26  Werner Koch  <wk@gnupg.org>
 
        * Makefile.am (libgpgme_la_LIBADD): Use libtool libraries.

diff --git a/trunk/gpgme/engine-gpgsm.c b/trunk/gpgme/engine-gpgsm.c
index f2584a08e1aacc34d2c8b01d18a7670ac6e74f1f..aa1b09f5e90219c370e6a540df597743b1cdb5fd 100644 (file)
--- a/trunk/gpgme/engine-gpgsm.c
+++ b/trunk/gpgme/engine-gpgsm.c
@@ -878,6 +878,7 @@ _gpgme_gpgsm_op_verify (GpgsmObject gpgsm, GpgmeData sig, GpgmeData text)
       gpgsm->output_data = text;
       err = gpgsm_set_fd (gpgsm->assuan_ctx, "OUTPUT", gpgsm->output_fd_server,
                          0);
+      _gpgme_io_close (gpgsm->message_fd);
     }
   else
     {
@@ -885,10 +886,10 @@ _gpgme_gpgsm_op_verify (GpgsmObject gpgsm, GpgmeData sig, GpgmeData text)
       gpgsm->message_data = text;
       err = gpgsm_set_fd (gpgsm->assuan_ctx, "MESSAGE",
                          gpgsm->message_fd_server, 0);
+      _gpgme_io_close (gpgsm->output_fd);
     }
   if (err)
     return err;
-  _gpgme_io_close (gpgsm->output_fd);
 
   return 0;
 }