diff options
| author | David Shaw <[email protected]> | 2002-07-17 19:48:19 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-07-17 19:48:19 +0000 |
| commit | 75ad30031f6167765973a8fb4dfb49c8b2a55ee7 (patch) | |
| tree | 7ee3f60cd167c3403df1a09b9b2be62043832272 /g10/keyserver.c | |
| parent | * gpgkeys_ldap.c (send_key, get_key, main): Consult the server version (diff) | |
| download | gnupg-75ad30031f6167765973a8fb4dfb49c8b2a55ee7.tar.gz gnupg-75ad30031f6167765973a8fb4dfb49c8b2a55ee7.zip | |
* keyedit.c (show_key_with_all_names_colon): The 0x40 class bit in a
designated revoker means "sensitive", not "local". It's exportable under
the right circumstances.
* main.h, options.h, export.c (do_export_stream), g10.c (main), hkp.c
(hkp_export), keyserver.c (keyserver_spawn: Add a flag to skip attribute
packets and their signatures while exporting. This is to accomodate
keyservers (pksd again) that choke on attributes. Use keyserver-option
"include-attributes" to control it. This defaults to ON (i.e. don't
skip).
Diffstat (limited to 'g10/keyserver.c')
| -rw-r--r-- | g10/keyserver.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c index 252459c88..4f3c4e790 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -54,6 +54,7 @@ struct kopts {"include-revoked",1,&opt.keyserver_options.include_revoked}, {"include-disabled",1,&opt.keyserver_options.include_disabled}, {"include-subkeys",1,&opt.keyserver_options.include_subkeys}, + {"include-attributes",0,&opt.keyserver_options.include_attributes}, {"keep-temp-files",0,&opt.keyserver_options.keep_temp_files}, {"honor-http-proxy",1,&opt.keyserver_options.honor_http_proxy}, {"broken-http-proxy",1,&opt.keyserver_options.broken_http_proxy}, @@ -451,6 +452,10 @@ keyserver_spawn(int action,STRLIST list, { armor_filter_context_t afx; IOBUF buffer=iobuf_temp(); + int attribs=EXPORT_FLAG_ONLYRFC; + + if(!opt.keyserver_options.include_attributes) + attribs|=EXPORT_FLAG_SKIPATTRIBS; temp=NULL; add_to_strlist(&temp,key->d); @@ -459,7 +464,7 @@ keyserver_spawn(int action,STRLIST list, afx.what=1; iobuf_push_filter(buffer,armor_filter,&afx); - if(export_pubkeys_stream(buffer,temp,1)==-1) + if(export_pubkeys_stream(buffer,temp,attribs)==-1) iobuf_close(buffer); else { |