4 files changed, 21 insertions, 2 deletions
diff --git a/ldap/servers/slapd/auditlog.c b/ldap/servers/slapd/auditlog.c
index 0f647db2..e4c3c1c3 100644
--- a/ldap/servers/slapd/auditlog.c
+++ b/ldap/servers/slapd/auditlog.c
@@ -31,7 +31,13 @@ write_audit_log_entry( Slapi_PBlock *pb )
 	int flag = 0;
 	int internal_op = 0;
 	Operation *op;
-	
+
+	/* if the audit log is not enabled, just skip all of
+	   this stuff */
+	if (!config_get_auditlog_logging_enabled()) {
+		return;
+	}
+
 	slapi_pblock_get( pb, SLAPI_OPERATION, &op );
 	internal_op = operation_is_flag_set(op, OP_FLAG_INTERNAL);
     slapi_pblock_get( pb, SLAPI_TARGET_DN, &dn );
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index f5816dcd..a96ec518 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -3356,6 +3356,18 @@ config_get_accesslog_level(){
   return retVal;
 }
 
+/*  return integer -- don't worry about locking similar to config_check_referral_mode 
+    below */
+
+int
+config_get_auditlog_logging_enabled(){
+  slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
+  int retVal;
+
+  retVal = slapdFrontendConfig->auditlog_logging_enabled;
+
+  return retVal;
+}
 
 char *config_get_referral_mode(void)
 {
diff --git a/ldap/servers/slapd/libslapd.def b/ldap/servers/slapd/libslapd.def
index 9d17e90a..38e15d9d 100644
--- a/ldap/servers/slapd/libslapd.def
+++ b/ldap/servers/slapd/libslapd.def
@@ -429,7 +429,7 @@ EXPORTS
 	config_set_accesscontrol 	@426
 	config_set_result_tweak 	@427
 	config_set_pw_gracelimit	@428
-; Available for reuse 	@429
+	config_get_auditlog_logging_enabled 	@429
 	config_set_security 	@430
 	config_set_pwpolicy_local	@431
 	config_set_readonly 	@432
diff --git a/ldap/servers/slapd/proto-slap.h b/ldap/servers/slapd/proto-slap.h
index 687aa727..455737ec 100644
--- a/ldap/servers/slapd/proto-slap.h
+++ b/ldap/servers/slapd/proto-slap.h
@@ -338,6 +338,7 @@ long config_get_pw_minage();
 long config_get_pw_warning();
 int config_get_errorlog_level();
 int config_get_accesslog_level();
+int config_get_auditlog_logging_enabled();
 char *config_get_referral_mode(void);
 int config_get_conntablesize(void);
 int config_check_referral_mode(void);