possible bug with --batch and 1.4.2

[David Shaw]

On Thu, Aug 04, 2005 at 04:24:01PM -0400, David Shaw wrote:
> > The patch doesn't apply, it's off by too many lines. After fixing this
> > however, I can't link because xmalloc_clear is not known. After adding
> > a dummy #define for xmalloc_clear in include/memory.h, things work out
> > fine. Thanks!
> > 
> > What's the next version that will include this fix? Should I notify the
> > FreeBSD GnuPG port maintainer so he can add this patch to the 1.4.2
> > port until the next version will be released?
> 
> This will be fixed in 1.4.3.  Here is a patch against 1.4.2 without
> all the fuzz.

Sorry - wrong patch.  Use this one instead.

David
-------------- next part --------------
Index: keygen.c
===================================================================
--- keygen.c	(revision 3850)
+++ keygen.c	(working copy)
@@ -3243,15 +3243,21 @@
 static int
 write_keyblock( IOBUF out, KBNODE node )
 {
-    for( ; node ; node = node->next ) {
-	int rc = build_packet( out, node->pkt );
-	if( rc ) {
-	    log_error("build_packet(%d) failed: %s\n",
+  for( ; node ; node = node->next )
+    {
+      if(!is_deleted_kbnode(node))
+	{
+	  int rc = build_packet( out, node->pkt );
+	  if( rc )
+	    {
+	      log_error("build_packet(%d) failed: %s\n",
 			node->pkt->pkttype, g10_errstr(rc) );
-	    return G10ERR_WRITE_FILE;
+	      return G10ERR_WRITE_FILE;
+	    }
 	}
     }
-    return 0;
+
+  return 0;
 }