Changeset 675 for server

Timestamp:

Mar 5, 2008, 7:56:07 PM (18 years ago)

Author:

geofft

Message:

Also check wildcard entries before falling back on the default.

File:

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

server/common/oursrc/httpdmods/mod_vhost_ldap.c

@@ -506 +506 @@
 
     if ((result == LDAP_NO_SUCH_OBJECT)) {
+        char* parent_hostname = apr_pstrdup(r->pool, hostname);
+        do {
+            parent_hostname = strchr(parent_hostname + 1, '.');
+        } while (parent_hostname && parent_hostname[-1] != '*');
+        if (parent_hostname) {
+            *(--parent_hostname) = '*';
+            ap_log_rerror(APLOG_MARK, APLOG_NOTICE|APLOG_NOERRNO, 0, r,
+                          "[mod_vhost_ldap.c] translate: "
+                          "virtual host not found, trying wildcard %s",
+                          parent_hostname);
+            hostname = parent_hostname;
+            goto fallback;
+        }
         if (conf->fallback && (is_fallback++ <= 0)) {
             ap_log_rerror(APLOG_MARK, APLOG_NOTICE|APLOG_NOERRNO, 0, r,