summaryrefslogtreecommitdiff
path: root/docs-xml
diff options
context:
space:
mode:
authorSamuel Cabrero <scabrero@samba.org>2021-09-28 10:43:40 +0200
committerJule Anger <janger@samba.org>2021-11-08 10:52:10 +0100
commitb9d8f8025b7122cab64c37e5042866c66b556016 (patch)
tree79ebcd3d43e554be4abac367f88937c3ac1cd534 /docs-xml
parent6ca265b8634cb35e444a4269956aed7ae49ccb1f (diff)
downloadsamba-b9d8f8025b7122cab64c37e5042866c66b556016.tar.gz
CVE-2020-25717: loadparm: Add new parameter "min domain uid"
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14801 BUG: https://bugzilla.samba.org/show_bug.cgi?id=14556 Pair-Programmed-With: Stefan Metzmacher <metze@samba.org> Signed-off-by: Samuel Cabrero <scabrero@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org> [abartlet@samba.org Backported from master/4.15 due to conflicts with other new parameters]
Diffstat (limited to 'docs-xml')
-rw-r--r--docs-xml/smbdotconf/security/mindomainuid.xml17
-rw-r--r--docs-xml/smbdotconf/winbind/idmapconfig.xml4
2 files changed, 21 insertions, 0 deletions
diff --git a/docs-xml/smbdotconf/security/mindomainuid.xml b/docs-xml/smbdotconf/security/mindomainuid.xml
new file mode 100644
index 00000000000..46ae795d730
--- /dev/null
+++ b/docs-xml/smbdotconf/security/mindomainuid.xml
@@ -0,0 +1,17 @@
+<samba:parameter name="min domain uid"
+ type="integer"
+ context="G"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>
+ The integer parameter specifies the minimum uid allowed when mapping a
+ local account to a domain account.
+ </para>
+
+ <para>
+ Note that this option interacts with the configured <emphasis>idmap ranges</emphasis>!
+ </para>
+</description>
+
+<value type="default">1000</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/winbind/idmapconfig.xml b/docs-xml/smbdotconf/winbind/idmapconfig.xml
index 1374040fb29..f70f11df757 100644
--- a/docs-xml/smbdotconf/winbind/idmapconfig.xml
+++ b/docs-xml/smbdotconf/winbind/idmapconfig.xml
@@ -80,6 +80,9 @@
authoritative for a unix ID to SID mapping, so it must be set
for each individually configured domain and for the default
configuration. The configured ranges must be mutually disjoint.
+ </para>
+ <para>
+ Note that the low value interacts with the <smbconfoption name="min domain uid"/> option!
</para></listitem>
</varlistentry>
@@ -115,4 +118,5 @@
</programlisting>
</description>
+<related>min domain uid</related>
</samba:parameter>