Attachment 9497 Details for Bug 46810

[patch] github-pr-auth_event_notification-162.patch

github-pr-auth_event_notification-162.patch (text/plain), 2.10 KB, created by Arvid Requate on 2018-04-13 17:10 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2018-04-13 17:10 CEST

Size: 2.10 KB

patch

obsolete

>From 7616ed8414876d445587dd02852ebad6df92de57 Mon Sep 17 00:00:00 2001
>From: Arvid Requate <requate@univention.de>
>Date: Wed, 11 Apr 2018 21:46:25 +0200
>Subject: [PATCH] Check "auth event notification" param in log_json
>
>When Samba is compiled with JSON support it logs an error message
>at log level 3 by default for every authentication event:
>
>get_auth_event_server: Failed to find 'auth_event' registered on the
>message bus to send JSON authentication events to:
>NT_STATUS_OBJECT_NAME_NOT_FOUND
>
>This patch adjusts the log_json function to consider the smb.conf
>parameter "auth event notification" before calling auth_message_send.
>
>Signed-off-by: Arvid Requate <requate@univention.de>
>---
> auth/auth_log.c | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
>diff --git a/auth/auth_log.c b/auth/auth_log.c
>index d4c6c445bed..c143ae306fb 100644
>--- a/auth/auth_log.c
>+++ b/auth/auth_log.c
>@@ -201,6 +201,7 @@ static void auth_message_send(struct imessaging_context *msg_ctx,
>  *
>  */
> static void log_json(struct imessaging_context *msg_ctx,
>+		     struct loadparm_context *lp_ctx,
> 		     struct json_context *context,
> 		     const char *type, int debug_class, int debug_level)
> {
>@@ -218,7 +219,9 @@ static void log_json(struct imessaging_context *msg_ctx,
> 	}
> 
> 	DEBUGC(debug_class, debug_level, ("JSON %s: %s\n", type, json));
>-	auth_message_send(msg_ctx, json);
>+	if (msg_ctx && lp_ctx && lpcfg_auth_event_notification(lp_ctx)) {
>+		auth_message_send(msg_ctx, json);
>+	}
> 
> 	if (json) {
> 		free(json);
>@@ -502,7 +505,12 @@ static void log_authentication_event_json(
> 	add_string(&authentication, "passwordType", get_password_type(ui));
> 	add_object(&context,AUTH_JSON_TYPE, &authentication);
> 
>-	log_json(msg_ctx, &context, AUTH_JSON_TYPE, DBGC_AUTH_AUDIT, debug_level);
>+	log_json(msg_ctx,
>+		 lp_ctx,
>+		 &context,
>+		 AUTH_JSON_TYPE,
>+		 DBGC_AUTH_AUDIT,
>+		 debug_level);
> 	free_json_context(&context);
> }
> 
>@@ -566,6 +574,7 @@ static void log_successful_authz_event_json(
> 	add_object(&context,AUTHZ_JSON_TYPE, &authorization);
> 
> 	log_json(msg_ctx,
>+		 lp_ctx,
> 		 &context,
> 		 AUTHZ_JSON_TYPE,
> 		 DBGC_AUTH_AUDIT,

Actions: View | Diff

Attachments on bug 46810: 9497