summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--g10/export.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/g10/export.c b/g10/export.c
index 1eec70935..edf27bc4d 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -2066,6 +2066,12 @@ do_export_stream (ctrl_t ctrl, iobuf_t out, strlist_t users, int secret,
NULL, NULL);
commit_kbnode (&keyblock);
}
+ else if (export_keep_uid || export_drop_subkey)
+ {
+ /* Need to merge so that for example the "usage" property
+ * has been setup. */
+ merge_keys_and_selfsig (ctrl, keyblock);
+ }
if (export_keep_uid)
{