GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Marcus Brinkmann 2004-03-11 14:31:20 +00:00
parent f7e02a469f
commit 9ee42a1e47
2 changed files with 53 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gpgme/ChangeLog
View File

@ -1,5 +1,8 @@
2004-03-11 Marcus Brinkmann <marcus@g10code.de> 2004-03-11 Marcus Brinkmann <marcus@g10code.de>
* engine-gpgsm.c (gpgsm_new): Protect all tty related code with
isatty().
* rungpg.c (gpg_cancel): Set GPG->fd_data_map to NULL after * rungpg.c (gpg_cancel): Set GPG->fd_data_map to NULL after
releasing it. releasing it.
* engine-gpgsm.c (gpgsm_cancel): Only call assuan_disconnect if * engine-gpgsm.c (gpgsm_cancel): Only call assuan_disconnect if

7
gpgme/engine-gpgsm.c
View File

@ -445,6 +445,8 @@ gpgsm_new (void **engine, const char *lc_ctype, const char *lc_messages)
} }
} }
if (isatty (1))
{
if (ttyname_r (1, dft_ttyname, sizeof (dft_ttyname))) if (ttyname_r (1, dft_ttyname, sizeof (dft_ttyname)))
{ {
err = gpg_error_from_errno (errno); err = gpg_error_from_errno (errno);
@ -479,8 +481,8 @@ gpgsm_new (void **engine, const char *lc_ctype, const char *lc_messages)
} }
free (dft_ttytype); free (dft_ttytype);
err = assuan_transact (gpgsm->assuan_ctx, optstr, NULL, NULL, NULL, err = assuan_transact (gpgsm->assuan_ctx, optstr, NULL, NULL,
NULL, NULL, NULL); NULL, NULL, NULL, NULL);
free (optstr); free (optstr);
if (err) if (err)
{ {
@ -521,6 +523,7 @@ gpgsm_new (void **engine, const char *lc_ctype, const char *lc_messages)
if (err) if (err)
goto leave; goto leave;
} }
}
if (!err if (!err
&& (_gpgme_io_set_close_notify (gpgsm->status_cb.fd, && (_gpgme_io_set_close_notify (gpgsm->status_cb.fd,