mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* options.h, keydb.h, g10.c (main), getkey.c (parse_auto_key_locate):
Parse a list of key access methods. (get_pubkey_byname): Walk the list here to try and retrieve keys we don't have locally.
This commit is contained in:
parent
e396cd2c7c
commit
7eab1846ca
5 changed files with 148 additions and 73 deletions
15
g10/gpg.c
15
g10/gpg.c
|
@ -354,14 +354,13 @@ enum cmd_and_opt_values
|
|||
oKeyidFormat,
|
||||
oExitOnStatusWriteError,
|
||||
oLimitCardInsertTries,
|
||||
|
||||
oReaderPort,
|
||||
octapiDriver,
|
||||
opcscDriver,
|
||||
oDisableCCID,
|
||||
|
||||
oRequireBacksigs,
|
||||
oNoRequireBacksigs,
|
||||
oAutoKeyLocate,
|
||||
|
||||
oNoop
|
||||
};
|
||||
|
@ -707,6 +706,7 @@ static ARGPARSE_OPTS opts[] = {
|
|||
{ oRecipient, "user", 2, "@" },
|
||||
{ oRequireBacksigs, "require-backsigs", 0, "@"},
|
||||
{ oNoRequireBacksigs, "no-require-backsigs", 0, "@"},
|
||||
{ oAutoKeyLocate, "auto-key-locate", 2, "@"},
|
||||
{0,NULL,0,NULL}
|
||||
};
|
||||
|
||||
|
@ -2645,6 +2645,17 @@ main (int argc, char **argv )
|
|||
case oRequireBacksigs: opt.require_backsigs=1; break;
|
||||
case oNoRequireBacksigs: opt.require_backsigs=0; break;
|
||||
|
||||
case oAutoKeyLocate:
|
||||
if(!parse_auto_key_locate(pargs.r.ret_str))
|
||||
{
|
||||
if(configname)
|
||||
log_error(_("%s:%d: invalid auto-key-locate list\n"),
|
||||
configname,configlineno);
|
||||
else
|
||||
log_error(_("invalid auto-key-locate list\n"));
|
||||
}
|
||||
break;
|
||||
|
||||
case oNoop: break;
|
||||
|
||||
default : pargs.err = configfp? 1:2; break;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue