Check "auth event notification" param in log_json

[nivanova/samba-autobuild/.git] / auth / auth_log.c

diff --git a/auth/auth_log.c b/auth/auth_log.c
index d4c6c445bed8dd05ef39c3a4be26f6a672d50e69..c143ae306fb2bfd342ec302f8dd1e8822ff4cd02 100644 (file)
--- 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,
  *
  */
 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)
 {
                     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));
        }
 
        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);
 
        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);
 
        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);
 }
 
        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,
        add_object(&context,AUTHZ_JSON_TYPE, &authorization);
 
        log_json(msg_ctx,

+                lp_ctx,

                 &context,
                 AUTHZ_JSON_TYPE,
                 DBGC_AUTH_AUDIT,
                 &context,
                 AUTHZ_JSON_TYPE,
                 DBGC_AUTH_AUDIT,