summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBjörn Baumbach <bb@sernet.de>2019-02-19 12:14:37 +0100
committerAndrew Bartlett <abartlet@samba.org>2019-07-04 02:07:20 +0000
commit89d95fb75cd2c29948cb17e01b41a5f0ba960dc5 (patch)
treea90b51092cb0872c648eb7cebf5b4b96594528ec /lib
parent7fd509a09b929933b8363d33aebb2e976abd2c73 (diff)
downloadsamba-89d95fb75cd2c29948cb17e01b41a5f0ba960dc5.tar.gz
ldb/ldb_ldif: add copy_raw_bytes helper variable to ldb_ldif_write_trace()
Signed-off-by: Björn Baumbach <bb@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/ldb/common/ldb_ldif.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ldb/common/ldb_ldif.c b/lib/ldb/common/ldb_ldif.c
index c2f1cb7c970..92520c476f3 100644
--- a/lib/ldb/common/ldb_ldif.c
+++ b/lib/ldb/common/ldb_ldif.c
@@ -352,6 +352,7 @@ static int ldb_ldif_write_trace(struct ldb_context *ldb,
for (j=0;j<msg->elements[i].num_values;j++) {
struct ldb_val v;
bool use_b64_encode = false;
+ bool copy_raw_bytes = false;
ret = a->syntax->ldif_write_fn(ldb, mem_ctx, &msg->elements[i].values[j], &v);
if (ret != LDB_SUCCESS) {
@@ -360,6 +361,7 @@ static int ldb_ldif_write_trace(struct ldb_context *ldb,
if (ldb->flags & LDB_FLG_SHOW_BINARY) {
use_b64_encode = false;
+ copy_raw_bytes = true;
} else if (a->flags & LDB_ATTR_FLAG_FORCE_BASE64_LDIF) {
use_b64_encode = true;
} else {
@@ -379,7 +381,7 @@ static int ldb_ldif_write_trace(struct ldb_context *ldb,
} else {
ret = fprintf_fn(private_data, "%s: ", msg->elements[i].name);
CHECK_RET;
- if (ldb->flags & LDB_FLG_SHOW_BINARY) {
+ if (copy_raw_bytes) {
ret = fprintf_fn(private_data, "%*.*s",
v.length, v.length, (char *)v.data);
} else {