audit_logging: auth_json_audit required auth_json

To log JSON the human-readable logs must also have been enabled

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13715

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Dec 14 14:32:25 CET 2018 on sn-devel-144

(cherry picked from commit 31957c7fe9d0f67bef08177e982043a23b172c7d)

Edited to apply to y4.9: Gary Lockyer <gary@catalyst.net.nz>

diff --git a/auth/auth_log.c b/auth/auth_log.c
index 67d23c12a1b852cc7670c326f9386c48a23be9af..38d29db4396d0e9a95881ebb592ea4650b570971 100644 (file)
--- a/auth/auth_log.c
+++ b/auth/auth_log.c
@@ -201,7 +201,7 @@ static void log_authentication_event_json(
                 lp_ctx,
                 &wrapper,
                 AUTH_JSON_TYPE,
-                DBGC_AUTH_AUDIT,
+                DBGC_AUTH_AUDIT_JSON,
                 debug_level);
        json_free(&wrapper);
 }
@@ -281,7 +281,7 @@ static void log_successful_authz_event_json(
                 lp_ctx,
                 &wrapper,
                 AUTHZ_JSON_TYPE,
-                DBGC_AUTH_AUDIT,
+                DBGC_AUTH_AUDIT_JSON,
                 debug_level);
        json_free(&wrapper);
 }