Changeset 3c6645b in mod_gnutls

Timestamp:

Nov 2, 2018, 7:57:02 AM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master, proxy-ticket

Children:

6d8c00c

Parents:

96e2ea8

git-author:

Fiona Klute <fiona.klute@…> (11/02/18 07:46:09)

git-committer:

Fiona Klute <fiona.klute@…> (11/02/18 07:57:02)

Message:

gnutls_hooks.c: Fix spaces in check_server_aliases()

File:

• src/gnutls_hooks.c (modified) (1 diff)

src/gnutls_hooks.c

@@ -875 +875 @@
 int check_server_aliases(vhost_cb_rec *x, server_rec * s, mgs_srvconf_rec *tsc)
 {
-        apr_array_header_t *names;
-        int rv = 0;
-        char ** name;
-
-        /* Check ServerName First! */
-        if(apr_strnatcasecmp(x->sni_name, s->server_hostname) == 0) {
-                // We have a match, save this server configuration
-                x->sc = tsc;
-                rv = 1;
-        /* Check any ServerAlias directives */
-        } else if(s->names->nelts) {
-                names = s->names;
-                name = (char **)names->elts;
-                for (int i = 0; i < names->nelts; ++i)
+    apr_array_header_t *names;
+    int rv = 0;
+    char ** name;
+
+    /* Check ServerName First! */
+    if(apr_strnatcasecmp(x->sni_name, s->server_hostname) == 0) {
+        // We have a match, save this server configuration
+        x->sc = tsc;
+        rv = 1;
+        /* Check any ServerAlias directives */
+    } else if(s->names->nelts) {
+        names = s->names;
+        name = (char **)names->elts;
+        for (int i = 0; i < names->nelts; ++i)
         {
-                        if (!name[i]) { continue; }
-                                if (apr_strnatcasecmp(x->sni_name, name[i]) == 0) {
-                                        // We have a match, save this server configuration
-                                        x->sc = tsc;
-                                        rv = 1;
-                        }
-                }
-        /* Wild any ServerAlias Directives */
-        } else if(s->wild_names->nelts) {
-                names = s->wild_names;
-        name = (char **)names->elts;
-                for (int i = 0; i < names->nelts; ++i)
+            if (!name[i]) { continue; }
+            if (apr_strnatcasecmp(x->sni_name, name[i]) == 0) {
+                // We have a match, save this server configuration
+                x->sc = tsc;
+                rv = 1;
+            }
+        }
+        /* Wild any ServerAlias Directives */
+    } else if(s->wild_names->nelts) {
+        names = s->wild_names;
+        name = (char **)names->elts;
+        for (int i = 0; i < names->nelts; ++i)
         {
-                        if (!name[i]) { continue; }
-                                if(apr_fnmatch(name[i], x->sni_name ,
-                                                                APR_FNM_CASE_BLIND|
-                                                                APR_FNM_PERIOD|
-                                                                APR_FNM_PATHNAME|
-                                                                APR_FNM_NOESCAPE) == APR_SUCCESS) {
-                                x->sc = tsc;
-                                rv = 1;
-                        }
-                }
-        }
-        return rv;
+            if (!name[i]) { continue; }
+            if(apr_fnmatch(name[i], x->sni_name ,
+                           APR_FNM_CASE_BLIND|
+                           APR_FNM_PERIOD|
+                           APR_FNM_PATHNAME|
+                           APR_FNM_NOESCAPE) == APR_SUCCESS) {
+                x->sc = tsc;
+                rv = 1;
+            }
+        }
+    }
+    return rv;
 }