diff options
| author | Marcus Brinkmann <[email protected]> | 2007-07-16 17:27:49 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2007-07-16 17:27:49 +0000 |
| commit | 174bf90842115b450eda3e57a133edfc36e48aee (patch) | |
| tree | dabf84b6bf0e74c1af5276f4afd1fc8c321bd7d5 | |
| parent | 2007-07-16 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-174bf90842115b450eda3e57a133edfc36e48aee.tar.gz gpgme-174bf90842115b450eda3e57a133edfc36e48aee.zip | |
2007-07-16 Marcus Brinkmann <[email protected]>
* engine-gpgsm.c (status_handler): Do not send BYE here.
| -rw-r--r-- | gpgme/ChangeLog | 4 | ||||
| -rw-r--r-- | gpgme/engine-gpgsm.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 441daf7d..126d7803 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,5 +1,7 @@ 2007-07-16 Marcus Brinkmann <[email protected]> + * 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 <[email protected]> * data-user.c (user_read, user_write, user_seek): Set errno and diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c index 9babac54..e7853918 100644 --- a/gpgme/engine-gpgsm.c +++ b/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' |