* options.h, main.h, export.c (parse_export_options, do_export_stream),

g10.c (main): add new --export-options option. Current flags are
"include-non-rfc", "include-local-sigs", "include-attributes", and
"include-sensitive-revkeys".

* options.h, hkp.c (hkp_export), keyserver.c (parse_keyserver_options,
keyserver_spawn): try passing unknown keyserver options to export options,
and if successful, use them when doing a keyserver --send-key.

* build-packet.c (build_sig_subpkt): We do not generate
SIGSUBPKT_PRIV_VERIFY_CACHE anymore.

1 files changed, 2 insertions, 5 deletions

diff --git a/g10/hkp.c b/g10/hkp.c
index 50626adf9..09fa5a12a 100644
--- a/g10/hkp.c
+++ b/g10/hkp.c
@@ -114,7 +114,6 @@ 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;
 
@@ -124,10 +123,8 @@ hkp_export( STRLIST users )
     afx.what = 1;
     iobuf_push_filter( temp, armor_filter, &afx );
 
-    if(!opt.keyserver_options.include_attributes)
-      attribs|=EXPORT_FLAG_SKIPATTRIBS;
-
-    rc = export_pubkeys_stream( temp, users, attribs );
+    rc = export_pubkeys_stream( temp, users,
+				opt.keyserver_options.export_options );
     if( rc == -1 ) {
 	iobuf_close(temp);
 	return 0;