mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* gpgsm.c: New command --keydb-clear-some-cert-flags.
* keydb.c (keydb_clear_some_cert_flags): New. (keydb_update_keyblock, keydb_set_flags): Change error code CONFLICT to NOT_LOCKED.
This commit is contained in:
parent
869a2bbad2
commit
236d241aed
5 changed files with 127 additions and 3 deletions
11
sm/gpgsm.c
11
sm/gpgsm.c
|
@ -85,6 +85,7 @@ enum cmd_and_opt_values {
|
|||
aDumpKeys,
|
||||
aDumpSecretKeys,
|
||||
aDumpExternalKeys,
|
||||
aKeydbClearSomeCertFlags,
|
||||
|
||||
oOptions,
|
||||
oDebug,
|
||||
|
@ -252,6 +253,7 @@ static ARGPARSE_OPTS opts[] = {
|
|||
{ aDumpKeys, "dump-keys", 256, "@"},
|
||||
{ aDumpExternalKeys, "dump-external-keys", 256, "@"},
|
||||
{ aDumpSecretKeys, "dump-secret-keys", 256, "@"},
|
||||
{ aKeydbClearSomeCertFlags, "keydb-clear-some-cert-flags", 256, "@"},
|
||||
|
||||
{ 301, NULL, 0, N_("@\nOptions:\n ") },
|
||||
|
||||
|
@ -894,6 +896,7 @@ main ( int argc, char **argv)
|
|||
case aListSigs:
|
||||
case aLearnCard:
|
||||
case aPasswd:
|
||||
case aKeydbClearSomeCertFlags:
|
||||
do_not_setup_keys = 1;
|
||||
set_cmd (&cmd, pargs.r_opt);
|
||||
break;
|
||||
|
@ -1531,6 +1534,14 @@ main ( int argc, char **argv)
|
|||
}
|
||||
break;
|
||||
|
||||
case aKeydbClearSomeCertFlags:
|
||||
for (sl=NULL; argc; argc--, argv++)
|
||||
add_to_strlist (&sl, *argv);
|
||||
keydb_clear_some_cert_flags (&ctrl, sl);
|
||||
free_strlist(sl);
|
||||
break;
|
||||
|
||||
|
||||
default:
|
||||
log_error ("invalid command (there is no implicit command)\n");
|
||||
break;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue