From 75ad30031f6167765973a8fb4dfb49c8b2a55ee7 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Wed, 17 Jul 2002 19:48:19 +0000 Subject: * 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). --- g10/hkp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'g10/hkp.c') diff --git a/g10/hkp.c b/g10/hkp.c index 1d4baaf47..50626adf9 100644 --- a/g10/hkp.c +++ b/g10/hkp.c @@ -114,6 +114,7 @@ hkp_export( STRLIST users ) IOBUF temp = iobuf_temp(); struct http_context hd; char *request; + int attribs=EXPORT_FLAG_ONLYRFC; unsigned int status; unsigned int hflags = opt.keyserver_options.honor_http_proxy? HTTP_FLAG_TRY_PROXY : 0; @@ -123,7 +124,10 @@ hkp_export( STRLIST users ) afx.what = 1; iobuf_push_filter( temp, armor_filter, &afx ); - rc = export_pubkeys_stream( temp, users, 1 ); + if(!opt.keyserver_options.include_attributes) + attribs|=EXPORT_FLAG_SKIPATTRIBS; + + rc = export_pubkeys_stream( temp, users, attribs ); if( rc == -1 ) { iobuf_close(temp); return 0; -- cgit v1.2.3