core: Fix duplication of close_notify_handler for gpgsm. master
authorNIIBE Yutaka <gniibe@fsij.org>
Fri, 19 Apr 2019 05:54:52 +0000 (14:54 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Fri, 19 Apr 2019 05:54:52 +0000 (14:54 +0900)
* src/engine-gpgsm.c [!USE_DESCRIPTOR_PASSING] (gpgsm_new): Remove
last call to _gpgme_io_set_close_notify.

--

It is called just after the code in question for all cases.

GnuPG-bug-id: 4456
Fixes-commit: dd21ec997cf4b6ba18538c63c728478110ad1f60
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
src/engine-gpgsm.c

index 396f19c..07fde4a 100644 (file)
@@ -549,8 +549,6 @@ gpgsm_new (void **engine, const char *file_name, const char *home_dir,
          || _gpgme_io_set_close_notify (gpgsm->output_cb.fd,
                                         close_notify_handler, gpgsm)
          || _gpgme_io_set_close_notify (gpgsm->message_cb.fd,
-                                        close_notify_handler, gpgsm)
-         || _gpgme_io_set_close_notify (gpgsm->diag_cb.fd,
                                         close_notify_handler, gpgsm)))
     {
       err = gpg_error (GPG_ERR_GENERAL);