aboutsummaryrefslogtreecommitdiffstats
path: root/g10/g10.c
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2004-05-08 13:51:14 +0000
committerDavid Shaw <[email protected]>2004-05-08 13:51:14 +0000
commit614304a54379fc040ded52296015402451166440 (patch)
tree1a762a1fdb9f7c925bb3fbdbda20d08cd0cc3b15 /g10/g10.c
parent(write_plaintext_packet): Fixed the detection of too (diff)
downloadgnupg-614304a54379fc040ded52296015402451166440.tar.gz
gnupg-614304a54379fc040ded52296015402451166440.zip
* keyedit.c (keyedit_menu, menu_set_keyserver_url): Allow passing
preferred keyserver on "keyserver" command line. Sanity check keyserver URL before accepting it. * keyserver-internal.h, g10.c (main), keyserver.c (parse_keyserver_uri): Add an option to require the scheme:// and change all callers. (free_keyserver_spec): Make public.
Diffstat (limited to '')
-rw-r--r--g10/g10.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/g10.c b/g10/g10.c
index 438242e52..6ced4f262 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -2084,10 +2084,10 @@ main( int argc, char **argv )
#endif /* __riscos__ */
break;
case oKeyServer:
- opt.keyserver=parse_keyserver_uri(pargs.r.ret_str,
+ opt.keyserver=parse_keyserver_uri(pargs.r.ret_str,0,
configname,configlineno);
if(!opt.keyserver)
- log_error(_("could not parse keyserver URI\n"));
+ log_error(_("could not parse keyserver URL\n"));
break;
case oKeyServerOptions:
if(!parse_keyserver_options(pargs.r.ret_str))