diff options
| author | David Shaw <[email protected]> | 2004-04-20 20:17:38 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-04-20 20:17:38 +0000 |
| commit | 36e6975ac9eae61afd8f3242f7fac01ddd87eec4 (patch) | |
| tree | 4f29b95b6bebebd2515de0667e1adf74b7bd88b7 | |
| parent | * options.h, g10.c (main): Add keyserver-option honor-keyserver-url. (diff) | |
| download | gnupg-36e6975ac9eae61afd8f3242f7fac01ddd87eec4.tar.gz gnupg-36e6975ac9eae61afd8f3242f7fac01ddd87eec4.zip | |
* keyserver.c (parse_keyserver_uri): Do not accept "http" as an alias for
"hkp". They are not the same thing.
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/keyserver.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index a460b97ae..8f26dfb90 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2004-04-20 David Shaw <[email protected]> + + * keyserver.c (parse_keyserver_uri): Do not accept "http" as an + alias for "hkp". They are not the same thing. + 2004-04-19 David Shaw <[email protected]> * options.h, g10.c (main): Add keyserver-option diff --git a/g10/keyserver.c b/g10/keyserver.c index 3670f6d13..8b71a6340 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -184,8 +184,7 @@ parse_keyserver_uri(char *uri,const char *configname,unsigned int configlineno) scheme="hkp"; add_to_strlist(&opt.keyserver_options.other,"broken-http-proxy"); } - else if(ascii_strcasecmp(scheme,"x-hkp")==0 - || ascii_strcasecmp(scheme,"http")==0) + else if(ascii_strcasecmp(scheme,"x-hkp")==0) { /* Canonicalize this to "hkp" so it works with both the internal and external keyserver interface. */ |