Changeset 1604 for trunk/server/common/oursrc/httpdmods

Timestamp:

Aug 26, 2010, 4:28:43 PM (14 years ago)

Author:

gdb

Message:

Refactor code for processing attributes from LDAP.

This patch should not change any behavior.  We do this refactoring in
preparation for switching to ap_walk_config.

File:

• trunk/server/common/oursrc/httpdmods/mod_vhost_ldap.c (modified) (1 diff)

trunk/server/common/oursrc/httpdmods/mod_vhost_ldap.c

@@ -576 +576 @@
     /* Optimize */
     if (vals) {
-        int i = 0;
-        while (attributes[i]) {
-
+        int i;
+        for (i = 0; attributes[i]; i++) {
+
+            char *val = apr_pstrdup (r->pool, vals[i]);
             if (strcasecmp (attributes[i], "apacheServerName") == 0) {
-                reqc->name = apr_pstrdup (r->pool, vals[i]);
+                reqc->name = val;
             }
             else if (strcasecmp (attributes[i], "apacheServerAdmin") == 0) {
-                reqc->admin = apr_pstrdup (r->pool, vals[i]);
+                reqc->admin = val;
             }
             else if (strcasecmp (attributes[i], "apacheDocumentRoot") == 0) {
-                reqc->docroot = apr_pstrdup (r->pool, vals[i]);
+                reqc->docroot = val;
             }
             else if (strcasecmp (attributes[i], "apacheScriptAlias") == 0) {
-                reqc->cgiroot = apr_pstrdup (r->pool, vals[i]);
+                reqc->cgiroot = val;
             }
             else if (strcasecmp (attributes[i], "apacheSuexecUid") == 0) {
-                reqc->uid = apr_pstrdup(r->pool, vals[i]);
+                reqc->uid = val;
             }
             else if (strcasecmp (attributes[i], "apacheSuexecGid") == 0) {
-                reqc->gid = apr_pstrdup(r->pool, vals[i]);
+                reqc->gid = val;
             }
-            i++;
         }
     }