diff options
author | Eric Covener <covener@apache.org> | 2011-05-08 20:36:17 +0200 |
---|---|---|
committer | Eric Covener <covener@apache.org> | 2011-05-08 20:36:17 +0200 |
commit | 67fa31c64ba00c5c93561f8dbf33109f78c23e50 (patch) | |
tree | ce065c81f7713ac85977cfd13a9fb75025154876 /modules/aaa/mod_authnz_ldap.c | |
parent | Updates. (diff) | |
download | apache2-67fa31c64ba00c5c93561f8dbf33109f78c23e50.tar.xz apache2-67fa31c64ba00c5c93561f8dbf33109f78c23e50.zip |
PR51163: Resolve crashes when LDAP is used for authorization-only
Submitted By: Scott Hill <shill genscape.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1100786 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/aaa/mod_authnz_ldap.c')
-rw-r--r-- | modules/aaa/mod_authnz_ldap.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/modules/aaa/mod_authnz_ldap.c b/modules/aaa/mod_authnz_ldap.c index eb77dad4e1..8c1e6c5696 100644 --- a/modules/aaa/mod_authnz_ldap.c +++ b/modules/aaa/mod_authnz_ldap.c @@ -827,6 +827,8 @@ static authz_status ldapgroup_check_authorization(request_rec *r, ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "ldap authorize: Creating LDAP req structure"); + req = (authn_ldap_request_t *)apr_pcalloc(r->pool, + sizeof(authn_ldap_request_t)); /* Build the username filter */ authn_ldap_build_filter(filtbuf, r, r->user, NULL, sec); @@ -841,8 +843,6 @@ static authz_status ldapgroup_check_authorization(request_rec *r, return AUTHZ_DENIED; } - req = (authn_ldap_request_t *)apr_pcalloc(r->pool, - sizeof(authn_ldap_request_t)); ap_set_module_config(r->request_config, &authnz_ldap_module, req); req->dn = apr_pstrdup(r->pool, dn); req->user = r->user; @@ -1005,6 +1005,8 @@ static authz_status ldapdn_check_authorization(request_rec *r, ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "ldap authorize: Creating LDAP req structure"); + req = (authn_ldap_request_t *)apr_pcalloc(r->pool, + sizeof(authn_ldap_request_t)); /* Build the username filter */ authn_ldap_build_filter(filtbuf, r, r->user, NULL, sec); @@ -1019,8 +1021,6 @@ static authz_status ldapdn_check_authorization(request_rec *r, return AUTHZ_DENIED; } - req = (authn_ldap_request_t *)apr_pcalloc(r->pool, - sizeof(authn_ldap_request_t)); ap_set_module_config(r->request_config, &authnz_ldap_module, req); req->dn = apr_pstrdup(r->pool, dn); req->user = r->user; @@ -1115,6 +1115,8 @@ static authz_status ldapattribute_check_authorization(request_rec *r, ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "ldap authorize: Creating LDAP req structure"); + req = (authn_ldap_request_t *)apr_pcalloc(r->pool, + sizeof(authn_ldap_request_t)); /* Build the username filter */ authn_ldap_build_filter(filtbuf, r, r->user, NULL, sec); @@ -1129,8 +1131,6 @@ static authz_status ldapattribute_check_authorization(request_rec *r, return AUTHZ_DENIED; } - req = (authn_ldap_request_t *)apr_pcalloc(r->pool, - sizeof(authn_ldap_request_t)); ap_set_module_config(r->request_config, &authnz_ldap_module, req); req->dn = apr_pstrdup(r->pool, dn); req->user = r->user; @@ -1229,6 +1229,8 @@ static authz_status ldapfilter_check_authorization(request_rec *r, ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "ldap authorize: Creating LDAP req structure"); + req = (authn_ldap_request_t *)apr_pcalloc(r->pool, + sizeof(authn_ldap_request_t)); /* Build the username filter */ authn_ldap_build_filter(filtbuf, r, r->user, NULL, sec); @@ -1243,8 +1245,6 @@ static authz_status ldapfilter_check_authorization(request_rec *r, return AUTHZ_DENIED; } - req = (authn_ldap_request_t *)apr_pcalloc(r->pool, - sizeof(authn_ldap_request_t)); ap_set_module_config(r->request_config, &authnz_ldap_module, req); req->dn = apr_pstrdup(r->pool, dn); req->user = r->user; |