1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00

Comment fixes.

Convey the new envvars when using simple-pwquery.
This commit is contained in:
Werner Koch 2008-03-06 18:28:47 +00:00
parent e751bcdd04
commit fa800e7c86
5 changed files with 34 additions and 4 deletions

View file

@ -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;
}