Attachment 14767 Details for Bug 13715 – Updated patch for 4.9

[patch] Updated patch for 4.9

bug-13715.patch.txt (text/plain), 1.30 KB, created by Gary Lockyer on 2019-01-13 20:58:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gary Lockyer

Created: 2019-01-13 20:58:36 UTC

Size: 1.30 KB

patch

obsolete

>From 77e41a220b9c97f55c2ca5b52899188f38ed9bab Mon Sep 17 00:00:00 2001
>From: Gary Lockyer <gary@catalyst.net.nz>
>Date: Mon, 14 Jan 2019 09:53:13 +1300
>Subject: [PATCH] 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>
>---
> auth/auth_log.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/auth/auth_log.c b/auth/auth_log.c
>index 67d23c12a1b..38d29db4396 100644
>--- 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);
> }
>-- 
>2.17.1
>

Flags:

timbeale: review+

Actions: View

Attachments on bug 13715: 14740 | 14767