aboutsummaryrefslogtreecommitdiffstats
path: root/g10/keyserver.c
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2005-09-14 22:31:21 +0000
committerDavid Shaw <[email protected]>2005-09-14 22:31:21 +0000
commit4afa18bcaacb2d75dd1eb97830b9e8fb709d2104 (patch)
tree538df6c905749d6cc0d7515eada2175829fb08a0 /g10/keyserver.c
parent* keyedit.c (show_names): Moved name display code out from (diff)
downloadgnupg-4afa18bcaacb2d75dd1eb97830b9e8fb709d2104.tar.gz
gnupg-4afa18bcaacb2d75dd1eb97830b9e8fb709d2104.zip
* main.h, misc.c (parse_options): Add the ability to have help
strings in xxx-options commands. * keyserver.c (keyserver_opts), import.c (parse_import_options), export.c (parse_export_options), g10.c (parse_list_options, main): Add help strings to xxx-options.
Diffstat (limited to 'g10/keyserver.c')
-rw-r--r--g10/keyserver.c29
1 files changed, 20 insertions, 9 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 9bd316d21..b9c96e8ac 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -74,15 +74,26 @@ struct keyrec
static struct parse_options keyserver_opts[]=
{
- {"include-revoked",KEYSERVER_INCLUDE_REVOKED,NULL},
- {"include-subkeys",KEYSERVER_INCLUDE_SUBKEYS,NULL},
- {"keep-temp-files",KEYSERVER_KEEP_TEMP_FILES,NULL},
- {"refresh-add-fake-v3-keyids",KEYSERVER_ADD_FAKE_V3,NULL},
- {"auto-key-retrieve",KEYSERVER_AUTO_KEY_RETRIEVE,NULL},
- {"auto-pka-retrieve",KEYSERVER_AUTO_PKA_RETRIEVE,NULL},
- {"try-dns-srv",KEYSERVER_TRY_DNS_SRV,NULL},
- {"honor-keyserver-url",KEYSERVER_HONOR_KEYSERVER_URL,NULL},
- {NULL,0,NULL}
+ {"include-revoked",KEYSERVER_INCLUDE_REVOKED,NULL,
+ N_("include revoked keys in search results")},
+ {"include-subkeys",KEYSERVER_INCLUDE_SUBKEYS,NULL,
+ N_("include subkeys when searching by key ID")},
+ /* not a real option - just for the help message */
+ {"use-temp-files",0,NULL,
+ N_("use temporary files to pass data to keyserver helpers")},
+ {"keep-temp-files",KEYSERVER_KEEP_TEMP_FILES,NULL,
+ N_("do not delete temporary files after using them")},
+ {"refresh-add-fake-v3-keyids",KEYSERVER_ADD_FAKE_V3,NULL,
+ NULL},
+ {"auto-key-retrieve",KEYSERVER_AUTO_KEY_RETRIEVE,NULL,
+ N_("automatically retrieve keys when verifying signatures")},
+ {"auto-pka-retrieve",KEYSERVER_AUTO_PKA_RETRIEVE,NULL,
+ NULL},
+ {"try-dns-srv",KEYSERVER_TRY_DNS_SRV,NULL,
+ NULL},
+ {"honor-keyserver-url",KEYSERVER_HONOR_KEYSERVER_URL,NULL,
+ N_("honor the preferred keyserver URL set on the key")},
+ {NULL,0,NULL,NULL}
};
static int keyserver_work(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,