Changeset 436 for server

Timestamp:

Oct 1, 2007, 6:25:38 PM (17 years ago)

Author:

andersk

Message:

Fix dir config merging in mod_auth_sslcert.

File:

• server/common/oursrc/httpdmods/mod_auth_sslcert.c (modified) (3 diffs)

server/common/oursrc/httpdmods/mod_auth_sslcert.c

@@ -1 +1 @@
 /* mod_auth_sslcert
- * version 1.1, released 2007-09-01 [NOT RELEASED YET]
+ * version 1.1.1, released 2007-10-01
  * Anders Kaseorg <andersk@mit.edu>
  *
@@ -36 +36 @@
     auth_sslcert_config_rec *conf = apr_pcalloc(p, sizeof(*conf));
 
-    conf->authoritative = 1;
+    conf->authoritative = -1;
     conf->var = NULL;
     conf->strip_suffix = NULL;
-    conf->strip_suffix_required = 1;
+    conf->strip_suffix_required = -1;
 
     return conf;
@@ -49 +49 @@
         *conf = apr_pcalloc(p, sizeof(*conf));
 
-    conf->authoritative = nconf->authoritative;
-    conf->var = (nconf->var != NULL) ? nconf->var : pconf->var;
+    conf->authoritative = (nconf->authoritative != -1) ?
+        nconf->authoritative : pconf->authoritative;
+    conf->var = (nconf->var != NULL) ?
+        nconf->var : pconf->var;
     conf->strip_suffix = (nconf->var != NULL || nconf->strip_suffix != NULL) ?
         nconf->strip_suffix : pconf->strip_suffix;
+    conf->strip_suffix_required = (nconf->var != NULL || nconf->strip_suffix_required != -1) ?
+        nconf->authoritative : pconf->authoritative;
 
     return conf;