From: Jeff Trawick <trawick@apache.org>
Date: Mon, 19 May 2014 12:24:06 +0000 (+0000)
Subject: Follow-up to r1588987:
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c729355a4acd5c3b3350ed7e51bc1ccbc70ce282;p=thirdparty%2Fapache%2Fhttpd.git

Follow-up to r1588987:

Fix doc and code confusion about the trust/distrust flag; 1 is
distrust, 0 or NULL/- is trust.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1595861 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_ssl_ct.xml b/docs/manual/mod/mod_ssl_ct.xml
index ca76549774e..029fdd0c7c9 100644
--- a/docs/manual/mod/mod_ssl_ct.xml
+++ b/docs/manual/mod/mod_ssl_ct.xml
@@ -453,10 +453,10 @@ ServerHello</description>
     public key.  If the name is not absolute, then it is assumed to be relative
     to <directive module="core">ServerRoot</directive>.</dd>
 
-    <dt><em>trust</em></dt>
-    <dd>This is a generic <q>trust</q> flag.  Set this field to <em>0</em> to
-    distrust this log, or to otherwise avoid using it for server certificate
-    submission.</dd>
+    <dt><em>trust/distrust</em></dt>
+    <dd>Set this field to <em>1</em> to distrust this log, or to otherwise avoid
+    using it for server certificate submission.  Set this to <em>-</em> or
+    <em>0</em> (the default) to treat the log normally.</dd>
 
     <dt><em>min-timestamp</em> and <em>max-timestamp</em></dt>
     <dd>A timestamp is a time as expressed in the number of milliseconds since the
diff --git a/modules/ssl/ssl_ct_log_config.c b/modules/ssl/ssl_ct_log_config.c
index de068ca57d3..1f8c7408166 100644
--- a/modules/ssl/ssl_ct_log_config.c
+++ b/modules/ssl/ssl_ct_log_config.c
@@ -203,7 +203,7 @@ apr_status_t save_log_config_entry(apr_array_header_t *log_config,
         distrusted = DISTRUSTED;
     }
     else if (!strcasecmp(distrusted_str, "0")) {
-        distrusted = DISTRUSTED;
+        distrusted = TRUSTED;
     }
     else {
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf,