diff options
| author | Werner Koch <[email protected]> | 2007-02-14 16:27:55 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2007-02-14 16:27:55 +0000 |
| commit | 5240d014f87974ae89d792458b63769b950da20f (patch) | |
| tree | 22ff17214a36dafacaaf89deea94ad7a6d3e2335 /agent/gpg-agent.c | |
| parent | * export.c (do_export_stream): Allow reset-subkey-passwd along (diff) | |
| download | gnupg-5240d014f87974ae89d792458b63769b950da20f.tar.gz gnupg-5240d014f87974ae89d792458b63769b950da20f.zip | |
agent/
* gpg-agent.c: New option --pinentry-touch-file.
(get_agent_socket_name): New.
* agent.h (opt): Add pinentry_touch_file.
* call-pinentry.c (start_pinentry): Send new option to the
pinentry.
Diffstat (limited to 'agent/gpg-agent.c')
| -rw-r--r-- | agent/gpg-agent.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 72a4013d6..c88e22cc1 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -78,6 +78,7 @@ enum cmd_and_opt_values oBatch, oPinentryProgram, + oPinentryTouchFile, oDisplay, oTTYname, oTTYtype, @@ -131,6 +132,7 @@ static ARGPARSE_OPTS opts[] = { { oPinentryProgram, "pinentry-program", 2 , N_("|PGM|use PGM as the PIN-Entry program") }, + { oPinentryTouchFile, "pinentry-touch-file", 2 , "@" }, { oScdaemonProgram, "scdaemon-program", 2 , N_("|PGM|use PGM as the SCdaemon program") }, { oDisableScdaemon, "disable-scdaemon", 0, N_("do not use the SCdaemon") }, @@ -401,6 +403,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread) opt.debug = 0; opt.no_grab = 0; opt.pinentry_program = NULL; + opt.pinentry_touch_file = NULL; opt.scdaemon_program = NULL; opt.def_cache_ttl = DEFAULT_CACHE_TTL; opt.def_cache_ttl_ssh = DEFAULT_CACHE_TTL_SSH; @@ -437,6 +440,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread) case oNoGrab: opt.no_grab = 1; break; case oPinentryProgram: opt.pinentry_program = pargs->r.ret_str; break; + case oPinentryTouchFile: opt.pinentry_touch_file = pargs->r.ret_str; break; case oScdaemonProgram: opt.scdaemon_program = pargs->r.ret_str; break; case oDisableScdaemon: opt.disable_scdaemon = 1; break; @@ -1186,6 +1190,16 @@ reread_configuration (void) } +/* Return the file name of the socket we are using for native + requests. */ +const char * +get_agent_socket_name (void) +{ + const char *s = socket_name; + + return (s && *s)? s : NULL; +} + /* Create a name for the socket. With USE_STANDARD_SOCKET given as |