From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Tue, 26 Jan 2016 00:33:15 +0000 (+1300)
Subject: ldb controls: use uint8_t* for contextID binary blob
X-Git-Tag: tdb-1.3.9~476
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16fda12282ac6ce044f28122376cedf0257582e7;p=thirdparty%2Fsamba.git

ldb controls: use uint8_t* for contextID binary blob

It is never a readable string.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
---

diff --git a/lib/ldb/common/ldb_controls.c b/lib/ldb/common/ldb_controls.c
index c76054031cd..343c8132b62 100644
--- a/lib/ldb/common/ldb_controls.c
+++ b/lib/ldb/common/ldb_controls.c
@@ -311,10 +311,9 @@ char *ldb_control_to_string(TALLOC_CTX *mem_ctx, const struct ldb_control *contr
 								struct ldb_vlv_resp_control);
 
 		char *cookie;
-		const uint8_t *c = (uint8_t*) rep_control->contextId;
 
 		cookie = ldb_base64_encode(mem_ctx,
-					   rep_control->contextId,
+					   (char *)rep_control->contextId,
 					   rep_control->ctxid_len);
 
 		res = talloc_asprintf(mem_ctx, "%s:%d:%d:%d:%d:%s",
@@ -497,7 +496,7 @@ struct ldb_control *ldb_parse_control_from_string(struct ldb_context *ldb, TALLO
 		}
 		if (ctxid[0]) {
 			control->ctxid_len = ldb_base64_decode(ctxid);
-			control->contextId = (char *)talloc_memdup(control, ctxid, control->ctxid_len);
+			control->contextId = talloc_memdup(control, ctxid, control->ctxid_len);
 		} else {
 			control->ctxid_len = 0;
 			control->contextId = NULL;
diff --git a/lib/ldb/include/ldb.h b/lib/ldb/include/ldb.h
index e715b92626a..7422d46f5ee 100644
--- a/lib/ldb/include/ldb.h
+++ b/lib/ldb/include/ldb.h
@@ -849,7 +849,7 @@ struct ldb_vlv_req_control {
 		} gtOrEq;
 	} match;
 	int ctxid_len;
-	char *contextId;
+	uint8_t *contextId;
 };
 
 struct ldb_vlv_resp_control {
@@ -857,7 +857,7 @@ struct ldb_vlv_resp_control {
 	int contentCount;
 	int vlv_result;
 	int ctxid_len;
-	char *contextId;
+	uint8_t *contextId;
 };
 
 struct ldb_verify_name_control {