From 891ab23411b7f20ef37d8bde81d9857b083235df Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 1 Mar 2017 14:41:47 +0100 Subject: gpg: Make --export-options work with --export-secret-keys. * g10/export.c (export_seckeys): Add arg OPTIONS and pass it to do_export. (export_secsubkeys): Ditto. * g10/gpg.c (main): Pass opt.export_options to export_seckeys and export_secsubkeys -- Back in the old days we did not used the export options for secret keys export because of a lot of duplicated code and that the old secring.gpg was anyway smaller that the pubring.gpg. With 2.1 it was pretty easy to enable it. Reported-by: Peter Lebbing GnuPG-bug-id: 2973 --- g10/main.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'g10/main.h') diff --git a/g10/main.h b/g10/main.h index 5ed501b3c..6837e989e 100644 --- a/g10/main.h +++ b/g10/main.h @@ -397,8 +397,10 @@ gpg_error_t parse_and_set_export_filter (const char *string); int export_pubkeys (ctrl_t ctrl, strlist_t users, unsigned int options, export_stats_t stats); -int export_seckeys (ctrl_t ctrl, strlist_t users, export_stats_t stats); -int export_secsubkeys (ctrl_t ctrl, strlist_t users, export_stats_t stats); +int export_seckeys (ctrl_t ctrl, strlist_t users, unsigned int options, + export_stats_t stats); +int export_secsubkeys (ctrl_t ctrl, strlist_t users, unsigned int options, + export_stats_t stats); gpg_error_t export_pubkey_buffer (ctrl_t ctrl, const char *keyspec, unsigned int options, -- cgit v1.2.3