diff options
| author | Ralph Boehme <slow@samba.org> | 2022-12-06 16:05:26 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2022-12-13 21:37:58 +0100 |
| commit | ddafd6dc7706e74e74ce96039ac8006b9b2e05ad (patch) | |
| tree | 3206091134452c8955838d90d34906e195570523 | |
| parent | 1040fa4c23509234af5ca5bf4c190c80183d39b4 (diff) | |
| download | samba-ddafd6dc7706e74e74ce96039ac8006b9b2e05ad.tar.gz | |
CVE-2022-38023 docs-xml: improve wording for several options: "yields precedence" -> "is over-riden"
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 830e865ba5648f6520bc552ffd71b61f754b8251)
5 files changed, 5 insertions, 5 deletions
diff --git a/docs-xml/smbdotconf/logon/allownt4crypto.xml b/docs-xml/smbdotconf/logon/allownt4crypto.xml index 03dc8fa93f7..06afcef73b1 100644 --- a/docs-xml/smbdotconf/logon/allownt4crypto.xml +++ b/docs-xml/smbdotconf/logon/allownt4crypto.xml @@ -18,7 +18,7 @@ <para>"allow nt4 crypto = yes" allows weak crypto to be negotiated, maybe via downgrade attacks.</para> - <para>This option yields precedence to the 'reject md5 clients' option.</para> + <para>This option is over-ridden by the 'reject md5 clients' option.</para> </description> <value type="default">no</value> diff --git a/docs-xml/smbdotconf/security/allowdcerpcauthlevelconnect.xml b/docs-xml/smbdotconf/security/allowdcerpcauthlevelconnect.xml index 03531adbfb3..8bccab391cc 100644 --- a/docs-xml/smbdotconf/security/allowdcerpcauthlevelconnect.xml +++ b/docs-xml/smbdotconf/security/allowdcerpcauthlevelconnect.xml @@ -15,7 +15,7 @@ <para>The behavior can be overwritten per interface name (e.g. lsarpc, netlogon, samr, srvsvc, winreg, wkssvc ...) by using 'allow dcerpc auth level connect:interface = yes' as option.</para> - <para>This option yields precedence to the implementation specific restrictions. + <para>This option is over-ridden by the implementation specific restrictions. E.g. the drsuapi and backupkey protocols require DCERPC_AUTH_LEVEL_PRIVACY. The dnsserver protocol requires DCERPC_AUTH_LEVEL_INTEGRITY. </para> diff --git a/docs-xml/smbdotconf/security/clientschannel.xml b/docs-xml/smbdotconf/security/clientschannel.xml index 5b07da95050..d124ad48181 100644 --- a/docs-xml/smbdotconf/security/clientschannel.xml +++ b/docs-xml/smbdotconf/security/clientschannel.xml @@ -23,7 +23,7 @@ <para>Note that for active directory domains this is hardcoded to <smbconfoption name="client schannel">yes</smbconfoption>.</para> - <para>This option yields precedence to the <smbconfoption name="require strong key"/> option.</para> + <para>This option is over-ridden by the <smbconfoption name="require strong key"/> option.</para> </description> <value type="default">yes</value> <value type="example">auto</value> diff --git a/docs-xml/smbdotconf/security/serverschannel.xml b/docs-xml/smbdotconf/security/serverschannel.xml index 79e4e73a95c..3e66df1c203 100644 --- a/docs-xml/smbdotconf/security/serverschannel.xml +++ b/docs-xml/smbdotconf/security/serverschannel.xml @@ -23,7 +23,7 @@ <para>If you still have legacy domain members use the <smbconfoption name="server require schannel:COMPUTERACCOUNT"/> option. </para> - <para>This option yields precedence to the <smbconfoption name="server require schannel:COMPUTERACCOUNT"/> option.</para> + <para>This option is over-ridden by the <smbconfoption name="server require schannel:COMPUTERACCOUNT"/> option.</para> </description> diff --git a/docs-xml/smbdotconf/winbind/requirestrongkey.xml b/docs-xml/smbdotconf/winbind/requirestrongkey.xml index b17620ec8f1..9c1c1d7af14 100644 --- a/docs-xml/smbdotconf/winbind/requirestrongkey.xml +++ b/docs-xml/smbdotconf/winbind/requirestrongkey.xml @@ -17,7 +17,7 @@ <para>Note for active directory domain this option is hardcoded to 'yes'</para> - <para>This option yields precedence to the <smbconfoption name="reject md5 servers"/> option.</para> + <para>This option is over-ridden by the <smbconfoption name="reject md5 servers"/> option.</para> <para>This option overrides the <smbconfoption name="client schannel"/> option.</para> </description> |