From: André Malo <nd@apache.org>
Date: Fri, 3 Jan 2003 02:45:30 +0000 (+0000)
Subject: some cleanup.
X-Git-Tag: pre_ajp_proxy~2337
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1852450fd89b6a5501aa6326e44d0742b8094f9b;p=apache

some cleanup.
- use already existing apr functionality
- remove unused variable


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98155 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/aaa/mod_authz_dbm.c b/modules/aaa/mod_authz_dbm.c
index 1601514021..5c3fee258f 100644
--- a/modules/aaa/mod_authz_dbm.c
+++ b/modules/aaa/mod_authz_dbm.c
@@ -120,9 +120,7 @@ static apr_status_t get_dbm_entry_as_str(request_rec *r, char *user,
     *str = NULL;
 
     if (apr_dbm_fetch(f, q, &d) == APR_SUCCESS && d.dptr) {
-        *str = apr_palloc(r->pool, d.dsize + 1);
-        strncpy(pw, d.dptr, d.dsize);
-        *str[d.dsize] = '\0'; /* Terminate the string */
+        *str = apr_pstrmemdup(r->pool, d.dptr, d.dsize);
     }
 
     apr_dbm_close(f);
@@ -209,7 +207,6 @@ static int dbm_check_auth(request_rec *r)
                                                       &authz_dbm_module);
     char *user = r->user;
     int m = r->method_number;
-    int required = 0;
     const apr_array_header_t *reqs_arr = ap_requires(r);
     require_line *reqs = reqs_arr ? (require_line *) reqs_arr->elts : NULL;
     register int x;
@@ -227,8 +224,6 @@ static int dbm_check_auth(request_rec *r)
 
     for (x = 0; x < reqs_arr->nelts; x++) {
 
-        required |= 1;
-
         if (!(reqs[x].method_mask & (AP_METHOD_BIT << m))) {
             continue;
         }
@@ -240,8 +235,6 @@ static int dbm_check_auth(request_rec *r)
             const char *orig_groups, *groups;
             char *v;
 
-            required |= 2;
-
             status = get_dbm_grp(r, user, conf->grpfile, conf->dbmtype,
                                  &groups);