github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-10-09 07:42:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renaming GSB functions

Browse Source
This commit is contained in:
brenosilva
2011-05-31 01:37:44 +00:00
parent 9ece2422c8
commit c8d2921051
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apache2/apache2_config.c
View File

@@ -1991,7 +1991,7 @@ static const char *cmd_geo_lookup_db(cmd_parms *cmd, void *_dcfg,
/* Google safe browsing */ /* Google safe browsing */
static const char *cmd_gsb_mal_lookup_db(cmd_parms *cmd, void *_dcfg, static const char *cmd_gsb_lookup_db(cmd_parms *cmd, void *_dcfg,
const char *p1) const char *p1)
{ {
const char *filename = resolve_relative_path(cmd->pool, cmd->directive->filename, p1); const char *filename = resolve_relative_path(cmd->pool, cmd->directive->filename, p1);
@@ -1999,7 +1999,7 @@ static const char *cmd_gsb_mal_lookup_db(cmd_parms *cmd, void *_dcfg,
directory_config *dcfg = (directory_config *)_dcfg; directory_config *dcfg = (directory_config *)_dcfg;
if (dcfg == NULL) return NULL; if (dcfg == NULL) return NULL;
if (gsb_mal_init(dcfg, filename, &error_msg) <= 0) { if (gsb_db_init(dcfg, filename, &error_msg) <= 0) {
return error_msg; return error_msg;
} }
@@ -2305,7 +2305,7 @@ const command_rec module_directives[] = {
AP_INIT_TAKE1 ( AP_INIT_TAKE1 (
"SecGsbLookupDB", "SecGsbLookupDB",
cmd_gsb_mal_lookup_db, cmd_gsb_lookup_db,
NULL, NULL,
RSRC_CONF, RSRC_CONF,
"database google safe browsing" "database google safe browsing"

6
apache2/msc_gsb.c
View File

@@ -14,7 +14,7 @@
#include "msc_gsb.h" #include "msc_gsb.h"
static int gsb_mal_create(directory_config *dcfg, char **error_msg) static int gsb_db_create(directory_config *dcfg, char **error_msg)
{ {
char errstr[1024]; char errstr[1024];
apr_pool_t *mp = dcfg->mp; apr_pool_t *mp = dcfg->mp;
@@ -89,7 +89,7 @@ static int gsb_mal_create(directory_config *dcfg, char **error_msg)
/** /**
* Initialise Gsb malware data structure * Initialise Gsb malware data structure
*/ */
int gsb_mal_init(directory_config *dcfg, const char *dbfn, char **error_msg) int gsb_db_init(directory_config *dcfg, const char *dbfn, char **error_msg)
{ {
*error_msg = NULL; *error_msg = NULL;
@@ -104,6 +104,6 @@ int gsb_mal_init(directory_config *dcfg, const char *dbfn, char **error_msg)
dcfg->gsb->db = NULL; dcfg->gsb->db = NULL;
dcfg->gsb->dbfn = apr_pstrdup(dcfg->mp, dbfn); dcfg->gsb->dbfn = apr_pstrdup(dcfg->mp, dbfn);
return gsb_mal_create(dcfg, error_msg); return gsb_db_create(dcfg, error_msg);
} }

5
apache2/msc_gsb.h
View File

@@ -19,13 +19,14 @@ typedef struct gsb_db gsb_db;
#include <apr_file_io.h> #include <apr_file_io.h>
#include "modsecurity.h" #include "modsecurity.h"
#include "apr_hash.h"
struct gsb_db { struct gsb_db {
apr_file_t *db; apr_file_t *db;
const char *dbfn; const char *dbfn;
apr_table_t *gsb_table; apr_hash_t *gsb_table;
}; };
int DSOLOCAL gsb_mal_init(directory_config *dcfg, const char *dbfn, char **error_msg); int DSOLOCAL gsb_db_init(directory_config *dcfg, const char *dbfn, char **error_msg);
#endif #endif