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 c76054031cd42b5bafb974c0f4847628046013f6..343c8132b624c19bab413f49967b1abd917f9f87 100644 (file)
--- 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 e715b92626a4663bfa6f049b512d95ada4439387..7422d46f5eef755550b3714db71adc790e421de9 100644 (file)
--- 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 {