From: Marcus Brinkmann Date: Mon, 16 Jul 2007 17:27:49 +0000 (+0000) Subject: 2007-07-16 Marcus Brinkmann X-Git-Tag: gpgme-1.2.0@1385~145 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=58b23648618e31379485272e5aa21f0b37abb5d4;p=gpgme.git 2007-07-16 Marcus Brinkmann * engine-gpgsm.c (status_handler): Do not send BYE here. --- diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog index 441daf7..126d780 100644 --- a/trunk/gpgme/ChangeLog +++ b/trunk/gpgme/ChangeLog @@ -1,5 +1,7 @@ 2007-07-16 Marcus Brinkmann + * 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 * data-user.c (user_read, user_write, user_seek): Set errno and diff --git a/trunk/gpgme/engine-gpgsm.c b/trunk/gpgme/engine-gpgsm.c index 9babac5..e785391 100644 --- a/trunk/gpgme/engine-gpgsm.c +++ b/trunk/gpgme/engine-gpgsm.c @@ -807,8 +807,10 @@ status_handler (void *opaque, int fd) 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 @@ status_handler (void *opaque, int fd) 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'