Changeset b7098b2 in mod_gnutls for src/gnutls_hooks.c

Timestamp:

Sep 25, 2011, 11:57:38 PM (9 years ago)

Author:

Dash Shendy <neuromancer@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, msva, proxy-ticket, upstream

Children:

0cfcbf3

Parents:

8581fac

Message:

ServerAlias? Directive Fix (For Apache 2.0.x)

File:

• src/gnutls_hooks.c (modified) (2 diffs)

src/gnutls_hooks.c

@@ -605 +605 @@
     for (s = ap_server_conf; s; s = s->next) {
 
-        tsc =
-                (mgs_srvconf_rec *)
-                ap_get_module_config(s->module_config, &gnutls_module);
-        if (tsc->enabled != GNUTLS_ENABLED_TRUE) {
-            continue;
-        }
+        tsc = (mgs_srvconf_rec *) ap_get_module_config(s->module_config, 
+                &gnutls_module);
+        
+        if (tsc->enabled != GNUTLS_ENABLED_TRUE) { continue; }
 #if MOD_GNUTLS_DEBUG
         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,
@@ -621 +619 @@
                 (unsigned int) s->next, (unsigned int) tsc);
 #endif
-        /* The CN can contain a * -- this will match those too. */
-        if (ap_strcasecmp_match(sni_name, tsc->cert_cn) == 0) {
-#if MOD_GNUTLS_DEBUG
-            ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,
-                    ctxt->c->base_server,
-                    "GnuTLS: Virtual Host: "
-                    "'%s' == '%s'", tsc->cert_cn,
-                    sni_name);
-#endif
-            return tsc;
-        }
-    }
+        /* Check ServerName First! */
+        if(!apr_strnatcasecmp(sni_name, s->server_hostname)) {
+                return tsc;
+        } else if(s->names) {
+        /* ServerAlias Directives */
+                names = s->names;
+                char **name = (char **)names->elts;            
+                for (i = 0; i < names->nelts; ++i) {
+                        if (!name[i]) { continue; } 
+                        if (!apr_strnatcasecmp(sni_name, name[i])) { 
+                            return tsc; }
+                }        
+        } else if(s->wild_names) {
+        /* Wild ServerAlias Directives */
+                names = s->wild_names;
+                char **name = (char **)names->elts;
+                for (i = 0; i < names->nelts; ++i) {
+                        if (!name[i]) { continue; } 
+                        if (!ap_strcasecmp_match(sni_name, name[i])) { 
+                            return tsc; }
+                }            
+        } /* End Wild Names*/        
+    } /* End For Loop */
 #endif
     return NULL;