diff options
| author | David Shaw <[email protected]> | 2002-08-26 19:26:56 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-08-26 19:26:56 +0000 |
| commit | 8d4602d72c7122d20359d38e7f8ee6be92892a2e (patch) | |
| tree | c65fdc8e2f1bd25f33149b48ac551061f91dff9c | |
| parent | * gpgkeys_hkp.c (parse_hkp_index, dehtmlize): Move HTML functionality into (diff) | |
| download | gnupg-8d4602d72c7122d20359d38e7f8ee6be92892a2e.tar.gz gnupg-8d4602d72c7122d20359d38e7f8ee6be92892a2e.zip | |
* gpgkeys_hkp.c (main): Don't warn about include-subkeys - it isn't
unsupported, it's actually non-meaningful in the context of HKP (yet).
Diffstat (limited to '')
| -rw-r--r-- | keyserver/ChangeLog | 4 | ||||
| -rw-r--r-- | keyserver/gpgkeys_hkp.c | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index facf9b247..1d40dce10 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,5 +1,9 @@ 2002-08-26 David Shaw <[email protected]> + * gpgkeys_hkp.c (main): Don't warn about include-subkeys - it + isn't unsupported, it's actually non-meaningful in the context of + HKP (yet). + * gpgkeys_hkp.c (parse_hkp_index, dehtmlize): Move HTML functionality into new "dehtmlize" function. Remove HTML before trying to parse each line from the keyserver. If the keyserver diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c index 2cb27be48..499aa104a 100644 --- a/keyserver/gpgkeys_hkp.c +++ b/keyserver/gpgkeys_hkp.c @@ -512,10 +512,13 @@ int parse_hkp_index(char *line,char **buffer) +1 +2 +10 - +4 + +3 + +3 + +1 +10 +1 - +1); + +1 + +20); if(buf) *buffer=buf; @@ -831,8 +834,7 @@ int main(int argc,char *argv[]) include_revoked=1; } else if(strcasecmp(start,"honor-http-proxy")==0 || - strcasecmp(start,"broken-http-proxy")==0 || - strcasecmp(start,"include-subkeys")==0) + strcasecmp(start,"broken-http-proxy")==0) { fprintf(stderr,"gpgkeys: HKP does not currently support %s\n", start); |