svn commit: r1595861 - in /httpd/httpd/trunk: docs/manual/mod/mod_ssl_ct.xml modules/ssl/ssl_ct_log_config.c

[tr...@apache.org]

Author: trawick
Date: Mon May 19 12:24:06 2014
New Revision: 1595861

URL: http://svn.apache.org/r1595861
Log:
Follow-up to r1588987:

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

Modified:
    httpd/httpd/trunk/docs/manual/mod/mod_ssl_ct.xml
    httpd/httpd/trunk/modules/ssl/ssl_ct_log_config.c

Modified: httpd/httpd/trunk/docs/manual/mod/mod_ssl_ct.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ssl_ct.xml?rev=1595861&r1=1595860&r2=1595861&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ssl_ct.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ssl_ct.xml Mon May 19 12:24:06 2014
@@ -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

Modified: httpd/httpd/trunk/modules/ssl/ssl_ct_log_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_ct_log_config.c?rev=1595861&r1=1595860&r2=1595861&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_ct_log_config.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_ct_log_config.c Mon May 19 12:24:06 2014
@@ -203,7 +203,7 @@ apr_status_t save_log_config_entry(apr_a
         distrusted = DISTRUSTED;
     }
     else if (!strcasecmp(distrusted_str, "0")) {
-        distrusted = DISTRUSTED;
+        distrusted = TRUSTED;
     }
     else {
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf,