From 9dbcfa0df1154cef85084ec87cfdbe31f5805513 Mon Sep 17 00:00:00 2001 From: Geoffrey Thomas Date: Thu, 6 Mar 2008 00:56:07 +0000 Subject: [PATCH] Also check wildcard entries before falling back on the default. Signed-off-by: Geoffrey Thomas [andersk@mit.edu: Simplify construction of wildcard hostnames.] Signed-off-by: Anders Kaseorg --- mod_vhost_ldap.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/mod_vhost_ldap.c b/mod_vhost_ldap.c index 890cb29..dc8a9e1 100644 --- a/mod_vhost_ldap.c +++ b/mod_vhost_ldap.c @@ -499,6 +499,18 @@ fallback: } if ((result == LDAP_NO_SUCH_OBJECT)) { + if (strcmp(hostname, "*") != 0) { + if (strncmp(hostname, "*.", 2) == 0) + hostname += 2; + hostname += strcspn(hostname, "."); + hostname = apr_pstrcat(r->pool, "*", hostname, NULL); + ap_log_rerror(APLOG_MARK, APLOG_NOTICE|APLOG_NOERRNO, 0, r, + "[mod_vhost_ldap.c] translate: " + "virtual host not found, trying wildcard %s", + hostname); + goto fallback; + } + null: if (conf->fallback && (is_fallback++ <= 0)) { ap_log_rerror(APLOG_MARK, APLOG_NOTICE|APLOG_NOERRNO, 0, r, -- 2.45.1