aboutsummaryrefslogtreecommitdiffstats
path: root/g10/import.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2016-07-12 13:09:18 +0000
committerWerner Koch <[email protected]>2016-07-12 13:13:34 +0000
commit9b075575cdc5851b019aed5ca5d5e18416beec8e (patch)
treeee98739a1e7138912396241dbbe2f6be88d2a05a /g10/import.c
parentgpg: Move a function from import.c to export.c. (diff)
downloadgnupg-9b075575cdc5851b019aed5ca5d5e18416beec8e.tar.gz
gnupg-9b075575cdc5851b019aed5ca5d5e18416beec8e.zip
gpg: Extend import-option import-export to print PKA or DANE.
* g10/export.c (do_export_stream): Move PKA and DANE printing helper code to ... (print_pka_or_dane_records): this fucntion. (write_keyblock_to_output): Add arg OPTIOSN and call print_pka_or_dane_records if requested. -- It is now possible to print a DANE record given a a file with a key without importing the key first: gpg --export-options export-dane \ --import-options import-export \ --import-filter keep-uid='mbox =~ alpha' \ --import FILE_WITH_KEY Using the filter we only print a user id with the substring "alpha" in the addr-spec. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/import.c')
-rw-r--r--g10/import.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/import.c b/g10/import.c
index 371f0951a..375bd03f8 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -1330,7 +1330,7 @@ import_one (ctrl_t ctrl,
merge_keys_and_selfsig (keyblock);
merge_keys_done = 1;
}
- rc = write_keyblock_to_output (keyblock, opt.armor);
+ rc = write_keyblock_to_output (keyblock, opt.armor, opt.export_options);
goto leave;
}