[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  5d4f229 s4-dsdb: fix the build of audit_util.c
      from  455cd66 addns: Fix a typo

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5d4f2294c9eeec31f9d087e4fb70611d8d824db8
Author: Günther Deschner <gd at samba.org>
Date:   Tue Jun 12 12:54:15 2018 +0200

    s4-dsdb: fix the build of audit_util.c
    
    Guenther
    
    Signed-off-by: Guenther Deschner <gd at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Sat Jun 16 11:56:53 CEST 2018 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 source4/dsdb/samdb/ldb_modules/audit_util.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/audit_util.c b/source4/dsdb/samdb/ldb_modules/audit_util.c
index e36ddcb..be2c522 100644
--- a/source4/dsdb/samdb/ldb_modules/audit_util.c
+++ b/source4/dsdb/samdb/ldb_modules/audit_util.c
@@ -470,6 +470,9 @@ static void dsdb_audit_add_ldb_value(
 	struct json_object *array,
 	const struct ldb_val lv)
 {
+	bool base64;
+	int len;
+	struct json_object value;
 
 	json_assert_is_array(array);
 	if (json_is_invalid(array)) {
@@ -481,9 +484,10 @@ static void dsdb_audit_add_ldb_value(
 		return;
 	}
 
-	bool base64 = ldb_should_b64_encode(NULL, &lv);
-	int len = min(lv.length, MAX_LENGTH);
-	struct json_object value = json_new_object();
+	base64 = ldb_should_b64_encode(NULL, &lv);
+	len = min(lv.length, MAX_LENGTH);
+	value = json_new_object();
+
 	if (lv.length > MAX_LENGTH) {
 		json_add_bool(&value, "truncated", true);
 	}


-- 
Samba Shared Repository