From: Marcus Brinkmann <mb@g10code.com>
Date: Sat, 27 Apr 2002 12:11:52 +0000 (+0000)
Subject: 2002-04-27  Marcus Brinkmann  <marcus@g10code.de>
X-Git-Tag: V0-3-6~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=40717c31840f35656700be5a469b7504060a33d5;p=gpgme.git

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/gpgme/ChangeLog b/gpgme/ChangeLog
index f2a9235..cfcdb8d 100644
--- a/gpgme/ChangeLog
+++ b/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/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c
index f2584a0..aa1b09f 100644
--- a/gpgme/engine-gpgsm.c
+++ b/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;
 }