mirror of git://git.gnupg.org/gnupg.git
Comment fixes.
Convey the new envvars when using simple-pwquery.
This commit is contained in:
parent
e751bcdd04
commit
fa800e7c86
|
@ -1,3 +1,8 @@
|
||||||
|
2008-03-06 Werner Koch <wk@g10code.com>
|
||||||
|
|
||||||
|
* simple-pwquery.c (agent_send_all_options): Add support for
|
||||||
|
XAUTHORITY and PINENTRY_USER_DATA.
|
||||||
|
|
||||||
2008-02-15 Marcus Brinkmann <marcus@g10code.de>
|
2008-02-15 Marcus Brinkmann <marcus@g10code.de>
|
||||||
|
|
||||||
* exechelp.c (gnupg_spawn_process_fd): Add flag DETACHED_PROCESS
|
* exechelp.c (gnupg_spawn_process_fd): Add flag DETACHED_PROCESS
|
||||||
|
|
|
@ -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
|
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
|
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.
|
Caller must xfree the returned string.
|
||||||
|
|
||||||
On error NULL is returned and the 20 bytes at FPR are not
|
On error NULL is returned and the 20 bytes at FPR are not
|
||||||
|
|
|
@ -207,6 +207,8 @@ agent_send_all_options (int fd)
|
||||||
char *dft_display = NULL;
|
char *dft_display = NULL;
|
||||||
char *dft_ttyname = NULL;
|
char *dft_ttyname = NULL;
|
||||||
char *dft_ttytype = NULL;
|
char *dft_ttytype = NULL;
|
||||||
|
char *dft_xauthority = NULL;
|
||||||
|
char *dft_pinentry_user_data = NULL;
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
|
|
||||||
dft_display = getenv ("DISPLAY");
|
dft_display = getenv ("DISPLAY");
|
||||||
|
@ -285,6 +287,25 @@ agent_send_all_options (int fd)
|
||||||
}
|
}
|
||||||
#endif /*HAVE_SETLOCALE*/
|
#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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,7 @@
|
||||||
|
2008-02-26 Werner Koch <wk@g10code.com>
|
||||||
|
|
||||||
|
* getkey.c (get_pubkey_byname): Fix comment.
|
||||||
|
|
||||||
2008-02-14 Werner Koch <wk@g10code.com>
|
2008-02-14 Werner Koch <wk@g10code.com>
|
||||||
|
|
||||||
* call-agent.c (default_inq_cb): New.
|
* call-agent.c (default_inq_cb): New.
|
||||||
|
|
|
@ -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
|
/* 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
|
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
|
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
|
was not found and NAME is a valid RFC822 mailbox and --auto-key-locate
|
||||||
has been enabled, we try to import the pkea via the PKA
|
has been enabled, we try to import the key via the online mechanisms
|
||||||
mechanism. */
|
defined by --auto-key-locate. */
|
||||||
int
|
int
|
||||||
get_pubkey_byname (PKT_public_key *pk,
|
get_pubkey_byname (PKT_public_key *pk,
|
||||||
const char *name, KBNODE *ret_keyblock,
|
const char *name, KBNODE *ret_keyblock,
|
||||||
|
|
Loading…
Reference in New Issue