From fa800e7c86a9c927af4f46d3a6c0822fcc5dc9dc Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 6 Mar 2008 18:28:47 +0000 Subject: [PATCH] Comment fixes. Convey the new envvars when using simple-pwquery. --- common/ChangeLog | 5 +++++ common/pka.c | 2 +- common/simple-pwquery.c | 21 +++++++++++++++++++++ g10/ChangeLog | 4 ++++ g10/getkey.c | 6 +++--- 5 files changed, 34 insertions(+), 4 deletions(-) diff --git a/common/ChangeLog b/common/ChangeLog index 05f516fa2..60679a8ae 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,3 +1,8 @@ +2008-03-06 Werner Koch + + * simple-pwquery.c (agent_send_all_options): Add support for + XAUTHORITY and PINENTRY_USER_DATA. + 2008-02-15 Marcus Brinkmann * exechelp.c (gnupg_spawn_process_fd): Add flag DETACHED_PROCESS diff --git a/common/pka.c b/common/pka.c index e8cdee61e..f592cb037 100644 --- a/common/pka.c +++ b/common/pka.c @@ -98,7 +98,7 @@ parse_txt_record (char *buffer, unsigned char *fpr) On success the 20 byte SHA-1 fingerprint is stored at FPR and the URI will be returned in an allocated buffer. Note that the URI - might be an zero length string as this information is optiobnal. + might be an zero length string as this information is optional. Caller must xfree the returned string. On error NULL is returned and the 20 bytes at FPR are not diff --git a/common/simple-pwquery.c b/common/simple-pwquery.c index 13617d2b9..fdaa34f07 100644 --- a/common/simple-pwquery.c +++ b/common/simple-pwquery.c @@ -207,6 +207,8 @@ agent_send_all_options (int fd) char *dft_display = NULL; char *dft_ttyname = NULL; char *dft_ttytype = NULL; + char *dft_xauthority = NULL; + char *dft_pinentry_user_data = NULL; int rc = 0; dft_display = getenv ("DISPLAY"); @@ -285,6 +287,25 @@ agent_send_all_options (int fd) } #endif /*HAVE_SETLOCALE*/ + /* Send the XAUTHORITY variable. */ + dft_xauthority = getenv ("XAUTHORITY"); + if (dft_xauthority) + { + /* We ignore errors here because older gpg-agents don't support + this option. */ + send_one_option (ctx, errsource, "xauthority", dft_xauthority); + } + + /* Send the PINENTRY_USER_DATA variable. */ + dft_pinentry_user_data = getenv ("PINENTRY_USER_DATA"); + if (dft_pinentry_user_data) + { + /* We ignore errors here because older gpg-agents don't support + this option. */ + send_one_option (ctx, errsource, "pinentry-user-data", + opt_pinentry_user_data); + } + return 0; } diff --git a/g10/ChangeLog b/g10/ChangeLog index 47636a333..f4deed471 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +2008-02-26 Werner Koch + + * getkey.c (get_pubkey_byname): Fix comment. + 2008-02-14 Werner Koch * call-agent.c (default_inq_cb): New. diff --git a/g10/getkey.c b/g10/getkey.c index d0d9bf451..c1d21f109 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -912,9 +912,9 @@ key_byname( GETKEY_CTX *retctx, strlist_t namelist, /* Find a public key from NAME and return the keyblock or the key. If ret_kdb is not NULL, the KEYDB handle used to locate this keyblock is returned and the caller is responsible for closing it. If a key - was not found and NAME is a valid RFC822 mailbox and PKA retrieval - has been enabled, we try to import the pkea via the PKA - mechanism. */ + was not found and NAME is a valid RFC822 mailbox and --auto-key-locate + has been enabled, we try to import the key via the online mechanisms + defined by --auto-key-locate. */ int get_pubkey_byname (PKT_public_key *pk, const char *name, KBNODE *ret_keyblock,