diff options
| author | Marcus Brinkmann <[email protected]> | 2006-11-29 19:21:18 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2006-11-29 19:21:18 +0000 |
| commit | 0bd5dd4b24bc50452d982bf033f758bc96a9b7f1 (patch) | |
| tree | 4c8a302a11df2a74a6301a91f09e0b0fa7d3f05f | |
| parent | Update to rev 231 of libassuan. (diff) | |
| download | gpgme-0bd5dd4b24bc50452d982bf033f758bc96a9b7f1.tar.gz gpgme-0bd5dd4b24bc50452d982bf033f758bc96a9b7f1.zip | |
2006-11-29 Marcus Brinkmann <[email protected]>
* engine-gpgsm.c (gpgsm_new): Check return value of
assuan_pipe_connect.
| -rw-r--r-- | gpgme/ChangeLog | 3 | ||||
| -rw-r--r-- | gpgme/engine-gpgsm.c | 3 | ||||
| -rw-r--r-- | gpgme/gpgme.h | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index b1587182..71efca61 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,5 +1,8 @@ 2006-11-29 Marcus Brinkmann <[email protected]> + * engine-gpgsm.c (gpgsm_new): Check return value of + assuan_pipe_connect. + * rungpg.c: Include <unistd.h>. (gpg_new): Support --display, --ttyname, --ttytype, --lc-ctype and --lc-messages. Fixes issue 734. diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c index 44dbd1f0..82b3fa86 100644 --- a/gpgme/engine-gpgsm.c +++ b/gpgme/engine-gpgsm.c @@ -406,7 +406,8 @@ gpgsm_new (void **engine, const char *file_name, const char *home_dir, err = assuan_pipe_connect (&gpgsm->assuan_ctx, file_name ? file_name : _gpgme_get_gpgsm_path (), argv, child_fds); - /* FIXME: Check error. */ + if (err) + goto leave; /* We need to know the fd used by assuan for reads. We do this by using the assumption that the first returned fd from diff --git a/gpgme/gpgme.h b/gpgme/gpgme.h index ac662429..6251a2f7 100644 --- a/gpgme/gpgme.h +++ b/gpgme/gpgme.h @@ -72,7 +72,7 @@ extern "C" { AM_PATH_GPGME macro) check that this header matches the installed library. Warning: Do not edit the next line. configure will do that for you! */ -#define GPGME_VERSION "1.1.3-cvs1179" +#define GPGME_VERSION "1.1.3-cvs1188" |