diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/gpg.c | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 9b8349917..f92c0fd02 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +2006-10-23 Werner Koch <[email protected]> + + * gpg.c (main): New command --gpgconf-list. + 2006-10-06 David Shaw <[email protected]> * keyserver.c (keyserver_spawn): Write the 16-digit keyid rather @@ -114,6 +114,7 @@ enum cmd_and_opt_values aLSignKey, aListConfig, aGPGConfList, + aGPGConfTest, aListPackets, aEditKey, aDeleteKeys, @@ -420,6 +421,7 @@ static ARGPARSE_OPTS opts[] = { #endif { aListConfig, "list-config", 256, "@"}, { aGPGConfList, "gpgconf-list", 256, "@" }, + { aGPGConfTest, "gpgconf-test", 256, "@" }, { aListPackets, "list-packets",256, "@"}, { aExportOwnerTrust, "export-ownertrust", 256, "@"}, { aImportOwnerTrust, "import-ownertrust", 256, "@"}, @@ -2011,6 +2013,7 @@ main (int argc, char **argv ) case aCheckKeys: case aListConfig: case aGPGConfList: + case aGPGConfTest: case aListPackets: case aImport: case aFastImport: @@ -3185,6 +3188,9 @@ main (int argc, char **argv ) if( opt.verbose > 1 ) set_packet_list_mode(1); + if (cmd == aGPGConfTest) + g10_exit(0); + /* Add the keyrings, but not for some special commands and not in case of "-kvv userid keyring". Also avoid adding the secret keyring for a couple of commands to avoid unneeded access in |