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

* g10.c, options.h: New option --gpg-agent-info

* passphrase.c (agent_open): Let it override the environment info.
* seckey-cert.c (check_secret_key): Always try 3 times when the
agent is enabled.
* options.skel: Describe --use-agent.
This commit is contained in:
Werner Koch 2002-01-26 16:34:00 +00:00
parent 441eb085c9
commit 806a4fa16e
6 changed files with 50 additions and 8 deletions

View file

@ -247,6 +247,7 @@ enum cmd_and_opt_values { aNull = 0,
oAutoKeyRetrieve,
oNoAutoKeyRetrieve,
oUseAgent,
oGpgAgentInfo,
oMergeOnly,
oTryAllSecrets,
oTrustedKey,
@ -358,6 +359,7 @@ static ARGPARSE_OPTS opts[] = {
{ oDryRun, "dry-run", 0, N_("do not make any changes") },
/*{ oInteractive, "interactive", 0, N_("prompt before overwriting") }, */
{ oUseAgent, "use-agent",0, N_("use the gpg-agent")},
{ oGpgAgentInfo, "gpg-agent-info",2, "@"},
{ oBatch, "batch", 0, N_("batch mode: never ask")},
{ oAnswerYes, "yes", 0, N_("assume yes on most questions")},
{ oAnswerNo, "no", 0, N_("assume no on most questions")},
@ -952,6 +954,7 @@ main( int argc, char **argv )
not_implemented("use-agent");
#endif /* __riscos__ */
break;
case oGpgAgentInfo: opt.gpg_agent_info = pargs.r.ret_str; break;
case oAnswerYes: opt.answer_yes = 1; break;
case oAnswerNo: opt.answer_no = 1; break;
case oKeyring: append_to_strlist( &nrings, pargs.r.ret_str); break;