CVE-2022-38023 docs-xml: improve wording for several options: "takes precedence"...

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15240

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 8ec62694a94c346e6ba8f3144a417c9984a1c8b9)

diff --git a/docs-xml/smbdotconf/logon/rejectmd5clients.xml b/docs-xml/smbdotconf/logon/rejectmd5clients.xml
index 41684ef10805eaf124023f57fa1ff42abbeafbbf..0bb9f6f6c8ec333e96eec4c7704a5605bd2fbec4 100644 (file)
--- a/docs-xml/smbdotconf/logon/rejectmd5clients.xml
+++ b/docs-xml/smbdotconf/logon/rejectmd5clients.xml
@@ -10,7 +10,7 @@
        <para>You can set this to yes if all domain members support aes.
        This will prevent downgrade attacks.</para>
 
-       <para>This option takes precedence to the 'allow nt4 crypto' option.</para>
+       <para>This option overrides the 'allow nt4 crypto' option.</para>
 </description>
 
 <value type="default">no</value>

diff --git a/docs-xml/smbdotconf/security/serverschannel.xml b/docs-xml/smbdotconf/security/serverschannel.xml
index b682d086f76b238155c5234c5875fabed8c2ce92..79e4e73a95c97d7b2681efad5994d7493f794b8c 100644 (file)
--- a/docs-xml/smbdotconf/security/serverschannel.xml
+++ b/docs-xml/smbdotconf/security/serverschannel.xml
@@ -59,7 +59,7 @@
        See CVE-2020-1472(ZeroLogon) https://bugzilla.samba.org/show_bug.cgi?id=14497
     </para>
 
-    <para>This option takes precedence to the <smbconfoption name="server schannel"/> option.</para>
+    <para>This option overrides the <smbconfoption name="server schannel"/> option.</para>
 
     <programlisting>
        server require schannel:LEGACYCOMPUTER1$ = no

diff --git a/docs-xml/smbdotconf/winbind/rejectmd5servers.xml b/docs-xml/smbdotconf/winbind/rejectmd5servers.xml
index 37656293aa47b449824885fb4703d87e05b1f0c2..151b4676c57b8b6d2a8a8f03c115d22884562c13 100644 (file)
--- a/docs-xml/smbdotconf/winbind/rejectmd5servers.xml
+++ b/docs-xml/smbdotconf/winbind/rejectmd5servers.xml
@@ -15,7 +15,7 @@
        <para>The behavior can be controlled per netbios domain
        by using 'reject md5 servers:NETBIOSDOMAIN = yes' as option.</para>
 
-       <para>This option takes precedence to the <smbconfoption name="require strong key"/> option.</para>
+       <para>This option overrides the <smbconfoption name="require strong key"/> option.</para>
 </description>
 
 <value type="default">no</value>

diff --git a/docs-xml/smbdotconf/winbind/requirestrongkey.xml b/docs-xml/smbdotconf/winbind/requirestrongkey.xml
index 4db62bfb02db7d399917d78457dacce31e15f324..b17620ec8f1d1549d9851aea891e14fce8c07fcc 100644 (file)
--- a/docs-xml/smbdotconf/winbind/requirestrongkey.xml
+++ b/docs-xml/smbdotconf/winbind/requirestrongkey.xml
@@ -19,7 +19,7 @@
 
        <para>This option yields precedence to the <smbconfoption name="reject md5 servers"/> option.</para>
 
-       <para>This option takes precedence to the <smbconfoption name="client schannel"/> option.</para>
+       <para>This option overrides the <smbconfoption name="client schannel"/> option.</para>
 </description>
 
 <value type="default">yes</value>