diff options
| author | Arvid Requate <requate@univention.de> | 2018-04-11 21:46:25 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-04-12 08:12:39 +0200 |
| commit | 490756a8401189550aa549d2eb1600c30e1c5d30 (patch) | |
| tree | 390f3e11ae311cb46cd0ecede7f06d371a7e8250 /auth | |
| parent | 040a526a3bbcafeeebb6dd50a563a4635dd79fea (diff) | |
| download | samba-490756a8401189550aa549d2eb1600c30e1c5d30.tar.gz | |
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.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13381
Signed-off-by: Arvid Requate <requate@univention.de>
Reviewed-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): Thu Apr 12 08:12:39 CEST 2018 on sn-devel-144
Diffstat (limited to 'auth')
| -rw-r--r-- | auth/auth_log.c | 13 |
1 files 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, |