From b5130acb4548ace418214c728cde5f7a0dab224b Mon Sep 17 00:00:00 2001
From: Erki Aring <erki@example.ee>
Date: Tue, 15 Nov 2022 17:31:18 +0200
Subject: [PATCH] Move APLOG_USE_MODULE out of modsecurity.h

---
 apache2/apache2_config.c    | 3 +++
 apache2/apache2_io.c        | 4 ++++
 apache2/apache2_util.c      | 4 ++++
 apache2/mod_security2.c     | 4 ++++
 apache2/modsecurity.c       | 4 ++++
 apache2/modsecurity.h       | 3 ---
 apache2/msc_status_engine.c | 5 ++++-
 apache2/re.c                | 4 ++++
 8 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/apache2/apache2_config.c b/apache2/apache2_config.c
index 9cc93f5d..69612f95 100644
--- a/apache2/apache2_config.c
+++ b/apache2/apache2_config.c
@@ -26,6 +26,9 @@
 #include "msc_lua.h"
 #endif
 
+#ifdef APLOG_USE_MODULE
+    APLOG_USE_MODULE(security2);
+#endif
 
 /* -- Directory context creation and initialisation -- */
 
diff --git a/apache2/apache2_io.c b/apache2/apache2_io.c
index f6c785e8..6490d61b 100644
--- a/apache2/apache2_io.c
+++ b/apache2/apache2_io.c
@@ -18,6 +18,10 @@
 #include "apache2.h"
 #include "msc_crypt.h"
 
+#ifdef APLOG_USE_MODULE
+    APLOG_USE_MODULE(security2);
+#endif
+
 /* -- Input filter -- */
 
 #if 0
diff --git a/apache2/apache2_util.c b/apache2/apache2_util.c
index 24bba0ce..cdae2b58 100644
--- a/apache2/apache2_util.c
+++ b/apache2/apache2_util.c
@@ -17,6 +17,10 @@
 #include "http_core.h"
 #include "util_script.h"
 
+#ifdef APLOG_USE_MODULE
+    APLOG_USE_MODULE(security2);
+#endif
+
 /**
  * Sends a brigade with an error bucket down the filter chain.
  */
diff --git a/apache2/mod_security2.c b/apache2/mod_security2.c
index 221d7539..4a0df827 100644
--- a/apache2/mod_security2.c
+++ b/apache2/mod_security2.c
@@ -46,6 +46,10 @@
 #include <yajl/yajl_version.h>
 #endif /* WITH_YAJL */
 
+#ifdef APLOG_USE_MODULE
+    APLOG_USE_MODULE(security2);
+#endif
+
 /* ModSecurity structure */
 
 msc_engine DSOLOCAL *modsecurity = NULL;
diff --git a/apache2/modsecurity.c b/apache2/modsecurity.c
index 4805de96..af529466 100644
--- a/apache2/modsecurity.c
+++ b/apache2/modsecurity.c
@@ -27,6 +27,10 @@
 #include <curl/curl.h>
 #endif
 
+#ifdef APLOG_USE_MODULE
+    APLOG_USE_MODULE(security2);
+#endif
+
 unsigned long int DSOLOCAL unicode_codepage = 0;
 
 int DSOLOCAL *unicode_map_table = NULL;
diff --git a/apache2/modsecurity.h b/apache2/modsecurity.h
index 0a6ae4d4..261151ba 100644
--- a/apache2/modsecurity.h
+++ b/apache2/modsecurity.h
@@ -145,9 +145,6 @@ extern DSOLOCAL char *real_server_signature;
 extern DSOLOCAL char *chroot_dir;
 
 extern module AP_MODULE_DECLARE_DATA security2_module;
-#ifdef APLOG_USE_MODULE
-    APLOG_USE_MODULE(security2);
-#endif
 
 extern DSOLOCAL const command_rec module_directives[];
 
diff --git a/apache2/msc_status_engine.c b/apache2/msc_status_engine.c
index 00165bd7..45876416 100644
--- a/apache2/msc_status_engine.c
+++ b/apache2/msc_status_engine.c
@@ -45,6 +45,10 @@
 #include <sys/utsname.h>
 #endif
 
+#ifdef APLOG_USE_MODULE
+    APLOG_USE_MODULE(security2);
+#endif
+
 // Bese32 encode, based on:
 // https://code.google.com/p/google-authenticator/source/browse/libpam/base32.c
 int DSOLOCAL msc_status_engine_base32_encode(char *encoded,
@@ -504,4 +508,3 @@ failed_beacon_string_malloc:
 
     return ret;
 }
-
diff --git a/apache2/re.c b/apache2/re.c
index 64a2a6ab..9ded3be7 100644
--- a/apache2/re.c
+++ b/apache2/re.c
@@ -20,6 +20,10 @@
 #include "msc_lua.h"
 #endif
 
+#ifdef APLOG_USE_MODULE
+    APLOG_USE_MODULE(security2);
+#endif
+
 static const char *const severities[] = {
     "EMERGENCY",
     "ALERT",