From f0a8f718ff474009300af6746fa0fbb61c649ea9 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 20 May 2004 13:25:06 +0000
Subject: r792:  - changed the ldb ldif_* functions to be in the ldb_ namespace

 - added better error reporting in ldbdel

 - fixed a bug in handling packing of records which contain elements
   with no values (it caused db corruption)

 - allow search with "dn" as target attribute
(This used to be commit 36575396234e3d35dbd442c8f1ff54a17ae64e64)
---
 source4/lib/ldb/ldb_tdb/ldb_pack.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'source4/lib/ldb/ldb_tdb/ldb_pack.c')

diff --git a/source4/lib/ldb/ldb_tdb/ldb_pack.c b/source4/lib/ldb/ldb_tdb/ldb_pack.c
index 8d1051be94..e71679646e 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_pack.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_pack.c
@@ -69,11 +69,17 @@ int ltdb_pack_data(struct ldb_context *ldb,
 		   const struct ldb_message *message,
 		   struct TDB_DATA *data)
 {
-	int i, j;
+	int i, j, real_elements=0;
 	size_t size;
 	char *p;
 	size_t len;
 
+	for (i=0;i<message->num_elements;i++) {
+		if (message->elements[i].num_values != 0) {
+			real_elements++;
+		}
+	}
+
 	/* work out how big it needs to be */
 	size = 8;
 
@@ -99,7 +105,7 @@ int ltdb_pack_data(struct ldb_context *ldb,
 
 	p = data->dptr;
 	put_uint32(p, 0, LTDB_PACKING_FORMAT); 
-	put_uint32(p, 4, message->num_elements); 
+	put_uint32(p, 4, real_elements); 
 	p += 8;
 
 	/* the dn needs to be packed so we can be case preserving
@@ -211,12 +217,14 @@ int ltdb_unpack_data(struct ldb_context *ldb,
 
 	message->elements = ldb_malloc_array_p(ldb, struct ldb_message_element,
 					       message->num_elements);
-				     
 	if (!message->elements) {
 		errno = ENOMEM;
 		goto failed;
 	}
 
+	memset(message->elements, 0, 
+	       message->num_elements * sizeof(struct ldb_message_element));
+
 	for (i=0;i<message->num_elements;i++) {
 		if (remaining < 10) {
 			errno = EIO;
@@ -243,6 +251,7 @@ int ltdb_unpack_data(struct ldb_context *ldb,
 			}
 		}
 		p += 4;
+		remaining -= 4;
 		for (j=0;j<message->elements[i].num_values;j++) {
 			len = pull_uint32(p, 0);
 			if (len > remaining-5) {
@@ -257,6 +266,11 @@ int ltdb_unpack_data(struct ldb_context *ldb,
 		}
 	}
 
+	if (remaining != 0) {
+		ldb_debug(ldb, LDB_DEBUG_ERROR, 
+			  "Error: %d bytes unread in ltdb_unpack_data\n", remaining);
+	}
+
 	return 0;
 
 failed:
-- 
cgit