diff options
| author | Marcus Brinkmann <[email protected]> | 2004-03-23 18:10:13 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2004-03-23 18:10:13 +0000 |
| commit | 3816adb43a110bb00e84b985f45a35ed2ab03b24 (patch) | |
| tree | 76bd7cf70eef01a8ce1c34150b0193f943091e97 | |
| parent | 2004-03-23 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-3816adb43a110bb00e84b985f45a35ed2ab03b24.tar.gz gpgme-3816adb43a110bb00e84b985f45a35ed2ab03b24.zip | |
2004-03-23 Marcus Brinkmann <[email protected]>
* engine-gpgsm.c (gpgsm_new): Protect _only_ tty related code with
isatty(). Submitted by Bernhard Herzog.
| -rw-r--r-- | gpgme/ChangeLog | 5 | ||||
| -rw-r--r-- | gpgme/engine-gpgsm.c | 58 |
2 files changed, 34 insertions, 29 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 78586773..9e52ee8b 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,8 @@ +2004-03-23 Marcus Brinkmann <[email protected]> + + * engine-gpgsm.c (gpgsm_new): Protect _only_ tty related code with + isatty(). Submitted by Bernhard Herzog. + 2004-03-11 Marcus Brinkmann <[email protected]> * engine-gpgsm.c (gpgsm_new): Protect all tty related code with diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c index 291af9b6..929b98c6 100644 --- a/gpgme/engine-gpgsm.c +++ b/gpgme/engine-gpgsm.c @@ -490,40 +490,40 @@ gpgsm_new (void **engine, const char *lc_ctype, const char *lc_messages) goto leave; } } + } + } - if (lc_ctype) - { - if (asprintf (&optstr, "OPTION lc-ctype=%s", lc_ctype) < 0) - err = gpg_error_from_errno (errno); - else - { - err = assuan_transact (gpgsm->assuan_ctx, optstr, NULL, NULL, - NULL, NULL, NULL, NULL); - free (optstr); - if (err) - err = map_assuan_error (err); - } - } + if (lc_ctype) + { + if (asprintf (&optstr, "OPTION lc-ctype=%s", lc_ctype) < 0) + err = gpg_error_from_errno (errno); + else + { + err = assuan_transact (gpgsm->assuan_ctx, optstr, NULL, NULL, + NULL, NULL, NULL, NULL); + free (optstr); if (err) - goto leave; - - if (lc_messages) - { - if (asprintf (&optstr, "OPTION lc-messages=%s", lc_messages) < 0) - err = gpg_error_from_errno (errno); - else - { - err = assuan_transact (gpgsm->assuan_ctx, optstr, NULL, NULL, - NULL, NULL, NULL, NULL); - free (optstr); - if (err) - err = map_assuan_error (err); - } - } + err = map_assuan_error (err); + } + } + if (err) + goto leave; + + if (lc_messages) + { + if (asprintf (&optstr, "OPTION lc-messages=%s", lc_messages) < 0) + err = gpg_error_from_errno (errno); + else + { + err = assuan_transact (gpgsm->assuan_ctx, optstr, NULL, NULL, + NULL, NULL, NULL, NULL); + free (optstr); if (err) - goto leave; + err = map_assuan_error (err); } } + if (err) + goto leave; if (!err && (_gpgme_io_set_close_notify (gpgsm->status_cb.fd, |