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>

diff --git a/lib/ldb/common/ldb_ldif.c b/lib/ldb/common/ldb_ldif.c
index c2f1cb7c9702b836789acd910da44c2350bf43d5..92520c476f34096c83ea3e60da51f6218aefcbb9 100644 (file)
--- 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 {