From 614304a54379fc040ded52296015402451166440 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Sat, 8 May 2004 13:51:14 +0000 Subject: * 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. --- g10/g10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'g10/g10.c') 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)) -- cgit v1.2.3