Revert "s4:ldb Remove LTDB_PACKING_FORMAT_NODN"

This reverts commit bcbf0ae1e707c2355824800dc213d364070f070a.

diff --git a/source4/lib/ldb/ldb_tdb/ldb_pack.c b/source4/lib/ldb/ldb_tdb/ldb_pack.c
index 7fe61c020ab15345f19a9af4e7a18b1ce864f921..e7aeb47e72d8bf4d627092004786a8848d44ff26 100644 (file)
--- a/source4/lib/ldb/ldb_tdb/ldb_pack.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_pack.c
@@ -36,6 +36,9 @@
 /* change this if the data format ever changes */
 #define LTDB_PACKING_FORMAT 0x26011967
 
+/* old packing formats */
+#define LTDB_PACKING_FORMAT_NODN 0x26011966
+
 /* use a portable integer format */
 static void put_uint32(uint8_t *p, int ofs, unsigned int val)
 {
@@ -180,6 +183,10 @@ int ltdb_unpack_data(struct ldb_module *module,
        remaining = data->dsize - 8;
 
        switch (format) {
+       case LTDB_PACKING_FORMAT_NODN:
+               message->dn = NULL;
+               break;
+
        case LTDB_PACKING_FORMAT:
                len = strnlen((char *)p, remaining);
                if (len == remaining) {

diff --git a/source4/lib/ldb/ldb_tdb/ldb_search.c b/source4/lib/ldb/ldb_tdb/ldb_search.c
index a089a2f82695aed7d5622a4796f2d282da871c13..a6647ccd506bc34a5953470118fd4efa438ccb0b 100644 (file)
--- a/source4/lib/ldb/ldb_tdb/ldb_search.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_search.c
@@ -401,6 +401,15 @@ static int search_func(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data, voi
                return -1;
        }
 
+       if (!msg->dn) {
+               msg->dn = ldb_dn_new(msg, ldb,
+                                    (char *)key.dptr + 3);
+               if (msg->dn == NULL) {
+                       talloc_free(msg);
+                       return -1;
+               }
+       }
+
        /* see if it matches the given expression */
        if (!ldb_match_msg(ldb, msg,
                           ac->tree, ac->base, ac->scope)) {