* export.c (do_export_stream): Allow reset-subkey-passwd along
authorWerner Koch <wk@gnupg.org>
Wed, 14 Feb 2007 16:26:05 +0000 (16:26 +0000)
committerWerner Koch <wk@gnupg.org>
Wed, 14 Feb 2007 16:26:05 +0000 (16:26 +0000)
with sexp-format.

g10/ChangeLog
g10/export.c

index 7f9f0fc..43e6c06 100644 (file)
@@ -1,3 +1,8 @@
+2007-02-06  Werner Koch  <wk@g10code.com>
+
+       * export.c (do_export_stream): Allow reset-subkey-passwd along
+       with sexp-format.
+
 2007-02-04  Werner Koch  <wk@g10code.com>
 
        * parse-packet.c (parse_signature): Limit bytes read for an
index 78def57..a4514ae 100644 (file)
@@ -564,7 +564,10 @@ do_export_stream( IOBUF out, strlist_t users, int secret,
                     goto leave;
                   }
 
-               rc = build_packet (out, node->pkt);
+                if ((options&EXPORT_SEXP_FORMAT))
+                  rc = build_sexp (out, node->pkt, &indent);
+                else
+                  rc = build_packet (out, node->pkt);
 
                 node->pkt->pkt.secret_key = sk_save;
                 free_secret_key (sk);