summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--doc/s6-tcpserver-access.html3
-rw-r--r--doc/upgrade.html3
3 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 1f31ab5..f69b6fb 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ In 2.5.1.4
- Bugfixes.
- Major performance improvements.
+ - Removed extra warning on s6-tcpserver-access with no ruleset.
In 2.5.1.3
diff --git a/doc/s6-tcpserver-access.html b/doc/s6-tcpserver-access.html
index d5b3ece..15f4246 100644
--- a/doc/s6-tcpserver-access.html
+++ b/doc/s6-tcpserver-access.html
@@ -138,7 +138,8 @@ against a filesystem-based database in the <em>rulesdir</em> directory. </li>
<li> <tt>-x&nbsp;<em>rulesfile</em></tt>&nbsp;: check client credentials
against a <a href="https://en.wikipedia.org/wiki/Cdb_(software)">cdb</a>
database in the <em>rulesfile</em> file. <tt>-i</tt> and <tt>-x</tt> are
-mutually exclusive. </li>
+mutually exclusive. If none of those options is given, no credential
+checking will be performed. </li>
</ul>
<h2> Access rule checking </h2>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index d71a59c..7b2c27b 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -33,6 +33,9 @@ optional dependency bumped to 3.7.3 </li>
optional dependency bumped to 1.1.1w </li>
<li> <a href="https://git.causal.agency/libretls/about/">LibreTLS</a>
optional dependency bumped to 3.7.0 </li>
+ <li> <a href="s6-tcpserver-access.html">s6-tcpserver-access</a> does
+not print a warning on <tt>-v 2</tt> or more when it is run without
+the <tt>-i</tt> or </tt>-x</tt> option. </li>
</ul>
<h2> in 2.5.1.3 </h2>