[svn] GnuPG - r4433 - trunk/g10

[svn author wk]

Author: wk
Date: 2007-02-14 17:26:05 +0100 (Wed, 14 Feb 2007)
New Revision: 4433

Modified:
   trunk/g10/ChangeLog
   trunk/g10/export.c
Log:
	* export.c (do_export_stream): Allow reset-subkey-passwd along
	with sexp-format.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2007-02-14 16:25:38 UTC (rev 4432)
+++ trunk/g10/ChangeLog	2007-02-14 16:26:05 UTC (rev 4433)
@@ -1,3 +1,8 @@
+2007-02-06  Werner Koch  <wk at g10code.com>
+
+	* export.c (do_export_stream): Allow reset-subkey-passwd along
+	with sexp-format.
+
 2007-02-04  Werner Koch  <wk at g10code.com>
 
 	* parse-packet.c (parse_signature): Limit bytes read for an

Modified: trunk/g10/export.c
===================================================================
--- trunk/g10/export.c	2007-02-14 16:25:38 UTC (rev 4432)
+++ trunk/g10/export.c	2007-02-14 16:26:05 UTC (rev 4433)
@@ -564,7 +564,10 @@
                     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);