summaryrefslogtreecommitdiff
path: root/source4/lib/ldb
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-09-01 19:55:30 +1000
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-10-02 12:45:03 +0200
commitbcbf0ae1e707c2355824800dc213d364070f070a (patch)
tree06ad1ab66aa3ca81a0c5d9d7a6e4dedda8268a0a /source4/lib/ldb
parenta610843e9f21ee77fd29356313d2ef05fe25a1ed (diff)
downloadsamba-bcbf0ae1e707c2355824800dc213d364070f070a.tar.gz
samba-bcbf0ae1e707c2355824800dc213d364070f070a.tar.bz2
samba-bcbf0ae1e707c2355824800dc213d364070f070a.zip
s4:ldb Remove LTDB_PACKING_FORMAT_NODN
The restructured code makes this hader to support, and we have not had this kind of LDB for a very long time now. Andrew Bartlett
Diffstat (limited to 'source4/lib/ldb')
-rw-r--r--source4/lib/ldb/ldb_tdb/ldb_pack.c7
-rw-r--r--source4/lib/ldb/ldb_tdb/ldb_search.c9
2 files changed, 0 insertions, 16 deletions
diff --git a/source4/lib/ldb/ldb_tdb/ldb_pack.c b/source4/lib/ldb/ldb_tdb/ldb_pack.c
index e7aeb47e72..7fe61c020a 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_pack.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_pack.c
@@ -36,9 +36,6 @@
/* 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)
{
@@ -183,10 +180,6 @@ 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 a6647ccd50..a089a2f826 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_search.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_search.c
@@ -401,15 +401,6 @@ 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)) {