From fb0df534f46ccee8d541d5512abbcc9cd8247e53 Mon Sep 17 00:00:00 2001 From: Kamen Mazdrashki Date: Tue, 18 Jan 2011 00:49:17 +0200 Subject: s4-ldb_ldif: Don't check for LDB_FLG_SHOW_BINARY in ldb_should_b64_encode LDB_FLG_SHOW_BINARY is data representation flag and should not modify behavior of data checking functions. This lead to a bug in lib/ldb/ldb_tdb/ldb_index.c as ltdb_index_key() function relies on ldb_should_b64_encode function to determine how to process index keys. Found using following test search: bin/ldbsearch -H st/dc/private/sam.ldb -b "CN=Deleted Objects,DC=samba,DC=example,DC=com" \ "(objectGUID=97b52eac-6d89-434d-b935-1e5f2e086ffc)" replPropertyMetaData --show-deleted --show-binary --- source4/lib/ldb/common/ldb_ldif.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source4') diff --git a/source4/lib/ldb/common/ldb_ldif.c b/source4/lib/ldb/common/ldb_ldif.c index 2628d4d5da..9be49fb73b 100644 --- a/source4/lib/ldb/common/ldb_ldif.c +++ b/source4/lib/ldb/common/ldb_ldif.c @@ -190,10 +190,6 @@ int ldb_should_b64_encode(struct ldb_context *ldb, const struct ldb_val *val) unsigned int i; uint8_t *p = val->data; - if (ldb->flags & LDB_FLG_SHOW_BINARY) { - return 0; - } - if (val->length == 0) { return 0; } -- cgit