www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Code Activity

some cleanup.

Browse Source 
- The weird bit mask handling is not really neccessary.
- call ap_note_auth_failure instead of ap_note_basic_auth_failure


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98177 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
André Malo
2003-01-06 06:13:44 +00:00
parent c1ee12bd0d
commit 550bc4dcb9
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/aaa/mod_authz_user.c
View File

@@ -111,7 +111,7 @@ static int check_user_access(request_rec *r)
&authz_user_module); &authz_user_module);
char *user = r->user; char *user = r->user;
int m = r->method_number; int m = r->method_number;
int method_restricted = 0; int required_user = 0;
register int x; register int x;
const char *t, *w; const char *t, *w;
const apr_array_header_t *reqs_arr = ap_requires(r); const apr_array_header_t *reqs_arr = ap_requires(r);
@@ -131,10 +131,6 @@ static int check_user_access(request_rec *r)
continue; continue;
} }
/* Note that there are applicable requirements
*/
method_restricted |= 1;
t = reqs[x].requirement; t = reqs[x].requirement;
w = ap_getword_white(r->pool, &t); w = ap_getword_white(r->pool, &t);
if (!strcmp(w, "valid-user")) { if (!strcmp(w, "valid-user")) {
@@ -144,7 +140,7 @@ static int check_user_access(request_rec *r)
/* And note that there are applicable requirements /* And note that there are applicable requirements
* which we consider ourselves the owner of. * which we consider ourselves the owner of.
*/ */
method_restricted |= 2; required_user = 1;
while (t[0]) { while (t[0]) {
w = ap_getword_conf(r->pool, &t); w = ap_getword_conf(r->pool, &t);
if (!strcmp(user, w)) { if (!strcmp(user, w)) {
@@ -154,17 +150,8 @@ static int check_user_access(request_rec *r)
} }
} }
if (method_restricted == 0) { if (!required_user) {
/* no applicable requirements at all */ /* no applicable requirements */
return DECLINED;
}
/* There are require methods which we do not
* understand.
*/
if ((method_restricted & 2) == 0) {
/* no requirements of which we consider ourselves
* the owner.
*/
return DECLINED; return DECLINED;
} }
@@ -177,7 +164,7 @@ static int check_user_access(request_rec *r)
"'require'ments for user/valid-user to be allowed access", "'require'ments for user/valid-user to be allowed access",
r->uri, user); r->uri, user);
ap_note_basic_auth_failure(r); ap_note_auth_failure(r);
return HTTP_UNAUTHORIZED; return HTTP_UNAUTHORIZED;
} }