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

Revert "Centralized function compatible with Linux & Windows (also with mpm-itk & mod_ruid2) to get username"

Browse Source 
This reverts commit c7b28f0e13.
This commit is contained in:
Marc Stern
2023-08-11 17:19:08 +02:00
parent c7b28f0e13
commit b3b33c9ff1
3 changed files with 841 additions and 821 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apache2/msc_util.c
View File

@@ -2843,14 +2843,3 @@ char* strtok_r(
} }
#endif #endif
// Function compatible with Linux & Windows, also with mpm-itk & mod_ruid2
char* get_username(apr_pool_t* mp) {
char* username;
apr_uid_t uid;
apr_gid_t gid;
int rc = apr_uid_current(&uid, &gid, mp);
if (rc != APR_SUCCESS) return "apache";
rc = apr_uid_name_get(&username, uid, mp);
if (rc != APR_SUCCESS) return "apache";
return username;
}

2
apache2/msc_util.h
View File

@@ -159,8 +159,6 @@ int DSOLOCAL tree_contains_ip(apr_pool_t *mp, TreeRoot *rtree,
int DSOLOCAL ip_tree_from_param(apr_pool_t *pool, int DSOLOCAL ip_tree_from_param(apr_pool_t *pool,
char *param, TreeRoot **rtree, char **error_msg); char *param, TreeRoot **rtree, char **error_msg);
char DSOLOCAL *get_username(apr_pool_t* mp);
#ifdef WITH_CURL #ifdef WITH_CURL
int ip_tree_from_uri(TreeRoot **rtree, char *uri, int ip_tree_from_uri(TreeRoot **rtree, char *uri,
apr_pool_t *mp, char **error_msg); apr_pool_t *mp, char **error_msg);

1649
apache2/persist_dbm.c
View File

File diff suppressed because it is too large Load Diff