Skip to content

Move APLOG_USE_MODULE out of modsecurity.h #2832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 15, 2022
Merged

Move APLOG_USE_MODULE out of modsecurity.h #2832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions apache2/apache2_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
#include "msc_lua.h"
#endif

#ifdef APLOG_USE_MODULE
APLOG_USE_MODULE(security2);
#endif

/* -- Directory context creation and initialisation -- */

Expand Down
4 changes: 4 additions & 0 deletions apache2/apache2_io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
#include "apache2.h"
#include "msc_crypt.h"

#ifdef APLOG_USE_MODULE
APLOG_USE_MODULE(security2);
#endif

/* -- Input filter -- */

#if 0
Expand Down
4 changes: 4 additions & 0 deletions apache2/apache2_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
4 changes: 4 additions & 0 deletions apache2/mod_security2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions apache2/modsecurity.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions apache2/modsecurity.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[];

Expand Down
5 changes: 4 additions & 1 deletion apache2/msc_status_engine.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -504,4 +508,3 @@ int msc_status_engine_call (void) {

return ret;
}

4 changes: 4 additions & 0 deletions apache2/re.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down