[svn] gpgme - r1239 - trunk/gpgme

[svn author marcus]

Author: marcus
Date: 2007-07-16 19:27:49 +0200 (Mon, 16 Jul 2007)
New Revision: 1239

Modified:
   trunk/gpgme/ChangeLog
   trunk/gpgme/engine-gpgsm.c
Log:
2007-07-16  Marcus Brinkmann  <marcus at g10code.de>

	* engine-gpgsm.c (status_handler): Do not send BYE here.


Modified: trunk/gpgme/ChangeLog
===================================================================
--- trunk/gpgme/ChangeLog	2007-07-16 17:26:09 UTC (rev 1238)
+++ trunk/gpgme/ChangeLog	2007-07-16 17:27:49 UTC (rev 1239)
@@ -1,5 +1,7 @@
 2007-07-16  Marcus Brinkmann  <marcus at g10code.de>
 
+	* engine-gpgsm.c (status_handler): Do not send BYE here.
+
 	* w32-io.c (struct reader_context_s, struct writer_context_s): New
 	members REFCOUNT.
 	(create_reader, create_writer): Initialize C->refcount to 1.
@@ -11,7 +13,7 @@
 	* w32-io.c (_gpgme_io_dup): Likewise.
 	* w32-glib-io.c (_gpgme_io_dup): Likewise.
 	* engine-gpgsm.c (start): Reverting to version 2007-07-10.
-	
+
 2007-07-13  Marcus Brinkmann  <marcus at g10code.de>
 
 	* data-user.c (user_read, user_write, user_seek): Set errno and

Modified: trunk/gpgme/engine-gpgsm.c
===================================================================
--- trunk/gpgme/engine-gpgsm.c	2007-07-16 17:26:09 UTC (rev 1238)
+++ trunk/gpgme/engine-gpgsm.c	2007-07-16 17:27:49 UTC (rev 1239)
@@ -807,8 +807,10 @@
       assuan_err = assuan_read_line (gpgsm->assuan_ctx, &line, &linelen);
       if (assuan_err)
 	{
+#if 0
 	  /* Try our best to terminate the connection friendly.  */
-	  /*	  assuan_write_line (gpgsm->assuan_ctx, "BYE"); */
+	  assuan_write_line (gpgsm->assuan_ctx, "BYE");
+#endif
 	  err = map_assuan_error (assuan_err);
           DEBUG3 ("fd %d: error from assuan (%d) getting status line : %s \n",
                   fd, assuan_err, gpg_strerror (err));
@@ -823,8 +825,10 @@
 	    err = gpg_error (GPG_ERR_GENERAL);
           DEBUG2 ("fd %d: ERR line - mapped to: %s\n",
                   fd, err? gpg_strerror (err):"ok");
+#if 0
 	  /* Try our best to terminate the connection friendly.  */
 	  assuan_write_line (gpgsm->assuan_ctx, "BYE");
+#endif
 	}
       else if (linelen >= 2
 	       && line[0] == 'O' && line[1] == 'K'