diff options
| author | David Shaw <[email protected]> | 2003-06-19 03:39:37 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-06-19 03:39:37 +0000 |
| commit | 36fce8bd932c8836ea9c4521807fe6267b9a4427 (patch) | |
| tree | f4873dbb0661aeccdcb981b65d7f1e8631b2bbad | |
| parent | * Add pointer in --ignore-time-conflict to see --ignore-valid from, and (diff) | |
| download | gnupg-36fce8bd932c8836ea9c4521807fe6267b9a4427.tar.gz gnupg-36fce8bd932c8836ea9c4521807fe6267b9a4427.zip | |
* keyserver.c (parse_keyserver_uri): Accept "http" as an alias for "hkp",
since it is occasionally written that way.
* mainproc.c (check_sig_and_print): Grammar fix ;)
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/keyserver.c | 3 | ||||
| -rw-r--r-- | g10/mainproc.c | 6 |
3 files changed, 12 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index c818e47a2..01bd32f43 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,10 @@ 2003-06-18 David Shaw <[email protected]> + * keyserver.c (parse_keyserver_uri): Accept "http" as an alias for + "hkp", since it is occasionally written that way. + + * mainproc.c (check_sig_and_print): Grammar fix ;) + * keygen.c (ask_user_id): Make --allow-freeform-uid apply to the email field as well as the name field, and allow mixing fields when it is set. diff --git a/g10/keyserver.c b/g10/keyserver.c index 6b7c91863..1b63664f0 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -156,7 +156,8 @@ parse_keyserver_uri(char *uri,const char *configname,unsigned int configlineno) opt.keyserver_scheme="hkp"; opt.keyserver_options.broken_http_proxy=1; } - else if(ascii_strcasecmp(opt.keyserver_scheme,"x-hkp")==0) + else if(ascii_strcasecmp(opt.keyserver_scheme,"x-hkp")==0 + || ascii_strcasecmp(opt.keyserver_scheme,"http")==0) { /* Canonicalize this to "hkp" so it works with both the internal and external keyserver interface. */ diff --git a/g10/mainproc.c b/g10/mainproc.c index c734dd6c3..5241fa551 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -1325,7 +1325,11 @@ check_sig_and_print( CTX c, KBNODE node ) while((p=enum_sig_subpkt(sig->hashed,SIGSUBPKT_PREF_KS,&n,&seq,NULL))) { - log_info(_("Key available from: ") ); + /* According to my favorite copy editor, in English + grammar, you say "at" if the key is located on a web + page, but "from" if it is located on a keyserver. I'm + not going to even try to make two strings here :) */ + log_info(_("Key available at: ") ); print_string( log_stream(), p, n, 0 ); putc( '\n', log_stream() ); } |