security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-28 22:49:59 +01:00
Code Activity

2004-12-17 Moritz Schulte <moritz@g10code.com>

Browse Source 
* query.c: Undo change from 2004-12-05.
This commit is contained in:
Moritz Schulte 2004-12-17 20:41:50 +00:00
parent 0ccb120f68
commit d75eda2b87
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent/ChangeLog
View File

@ -1,3 +1,7 @@
2004-12-17 Moritz Schulte <moritz@g10code.com>
* query.c: Undo change from 2004-12-05.
2004-12-15 Werner Koch <wk@g10code.com> 2004-12-15 Werner Koch <wk@g10code.com>
* gpg-agent.c [W32]: Various hacks to make it work. * gpg-agent.c [W32]: Various hacks to make it work.

10
agent/query.c
View File

@ -152,7 +152,7 @@ start_pinentry (CTRL ctrl)
pgmname++; pgmname++;
argv[0] = pgmname; argv[0] = pgmname;
if (ctrl && ctrl->display && !opt.keep_display) if (ctrl->display && !opt.keep_display)
{ {
argv[1] = "--display"; argv[1] = "--display";
argv[2] = ctrl->display; argv[2] = ctrl->display;
@ -189,7 +189,7 @@ start_pinentry (CTRL ctrl)
NULL, NULL, NULL, NULL, NULL, NULL); NULL, NULL, NULL, NULL, NULL, NULL);
if (rc) if (rc)
return unlock_pinentry (map_assuan_err (rc)); return unlock_pinentry (map_assuan_err (rc));
if (ctrl && ctrl->ttyname) if (ctrl->ttyname)
{ {
char *optstr; char *optstr;
if (asprintf (&optstr, "OPTION ttyname=%s", ctrl->ttyname) < 0 ) if (asprintf (&optstr, "OPTION ttyname=%s", ctrl->ttyname) < 0 )
@ -200,7 +200,7 @@ start_pinentry (CTRL ctrl)
if (rc) if (rc)
return unlock_pinentry (map_assuan_err (rc)); return unlock_pinentry (map_assuan_err (rc));
} }
if (ctrl && ctrl->ttytype) if (ctrl->ttytype)
{ {
char *optstr; char *optstr;
if (asprintf (&optstr, "OPTION ttytype=%s", ctrl->ttytype) < 0 ) if (asprintf (&optstr, "OPTION ttytype=%s", ctrl->ttytype) < 0 )
@ -210,7 +210,7 @@ start_pinentry (CTRL ctrl)
if (rc) if (rc)
return unlock_pinentry (map_assuan_err (rc)); return unlock_pinentry (map_assuan_err (rc));
} }
if (ctrl && ctrl->lc_ctype) if (ctrl->lc_ctype)
{ {
char *optstr; char *optstr;
if (asprintf (&optstr, "OPTION lc-ctype=%s", ctrl->lc_ctype) < 0 ) if (asprintf (&optstr, "OPTION lc-ctype=%s", ctrl->lc_ctype) < 0 )
@ -220,7 +220,7 @@ start_pinentry (CTRL ctrl)
if (rc) if (rc)
return unlock_pinentry (map_assuan_err (rc)); return unlock_pinentry (map_assuan_err (rc));
} }
if (ctrl && ctrl->lc_messages) if (ctrl->lc_messages)
{ {
char *optstr; char *optstr;
if (asprintf (&optstr, "OPTION lc-messages=%s", ctrl->lc_messages) < 0 ) if (asprintf (&optstr, "OPTION lc-messages=%s", ctrl->lc_messages) < 0 )