mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* 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.
This commit is contained in:
parent
b65aced7b2
commit
002f085c23
8 changed files with 111 additions and 33 deletions
|
@ -110,7 +110,8 @@ parse_keyserver_options(char *options)
|
|||
else if(ascii_strcasecmp(tok,"no-use-temp-files")==0)
|
||||
opt.keyserver_options.use_temp_files=0;
|
||||
#endif
|
||||
else if(strlen(tok)>0)
|
||||
else if(!parse_export_options(tok,
|
||||
&opt.keyserver_options.export_options))
|
||||
add_to_strlist(&opt.keyserver_options.other,tok);
|
||||
}
|
||||
}
|
||||
|
@ -451,10 +452,6 @@ 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);
|
||||
|
@ -463,7 +460,8 @@ keyserver_spawn(int action,STRLIST list,
|
|||
afx.what=1;
|
||||
iobuf_push_filter(buffer,armor_filter,&afx);
|
||||
|
||||
if(export_pubkeys_stream(buffer,temp,attribs)==-1)
|
||||
if(export_pubkeys_stream(buffer,temp,
|
||||
opt.keyserver_options.export_options)==-1)
|
||||
iobuf_close(buffer);
|
||||
else
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue