dsdb group auditing: remove HAVE_JANSSON from group_audit
authorGary Lockyer <gary@catalyst.net.nz>
Fri, 13 Jul 2018 01:34:28 +0000 (13:34 +1200)
committerGary Lockyer <gary@samba.org>
Wed, 25 Jul 2018 04:29:50 +0000 (06:29 +0200)
This modules is ADDC only and JANSSON is required for the ADDC builds,
so the ifdef is no longer necessary.

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
source4/dsdb/samdb/ldb_modules/group_audit.c

index 1166c697a09e2150c49b826ffded2e175d7d6552..1c74805eed0e22816487d4562de1c7d8eac5388f 100644 (file)
@@ -90,7 +90,6 @@ static struct GUID *get_transaction_id(
        return &transaction_id->transaction_guid;
 }
 
-#ifdef HAVE_JANSSON
 /*
  * @brief generate a JSON log entry for a group change.
  *
@@ -208,7 +207,6 @@ failure:
        DBG_ERR("Failed to create group change JSON log message\n");
        return wrapper;
 }
-#endif
 
 /*
  * @brief generate a human readable log entry for a group change.
@@ -493,7 +491,6 @@ static void log_primary_group_change(
                TALLOC_FREE(message);
        }
 
-#ifdef HAVE_JANSSON
        if (CHECK_DEBUGLVLC(DBGC_DSDB_GROUP_AUDIT_JSON, GROUP_LOG_LVL) ||
                (ac->msg_ctx && ac->send_events)) {
 
@@ -519,7 +516,6 @@ static void log_primary_group_change(
                }
                json_free(&json);
        }
-#endif
        TALLOC_FREE(ctx);
 }
 
@@ -569,7 +565,6 @@ static void log_membership_change(
                TALLOC_FREE(message);
        }
 
-#ifdef HAVE_JANSSON
        if (CHECK_DEBUGLVLC(DBGC_DSDB_GROUP_AUDIT_JSON, GROUP_LOG_LVL) ||
                (ac->msg_ctx && ac->send_events)) {
                struct json_object json;
@@ -594,7 +589,6 @@ static void log_membership_change(
                }
                json_free(&json);
        }
-#endif
        TALLOC_FREE(ctx);
 }