The branch, master has been updated
via 230f8db40f1 docs-xml: Fix script idmap backend documentation
via 3f76b98037d docs-xml: Tweak autorid idmap backend documentation
via 6989ec3873a docs-xml: Fix rid idmap backend documentation
from 4da50463e1b smbd: don't leak the fsp if close_file_smb() fails
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 230f8db40f13cece42dbaf1053b4e32233e50282
Author: Martin Schwenke <mschwe...@ddn.com>
Date: Tue Jul 4 10:49:39 2023 +1000
docs-xml: Fix script idmap backend documentation
This was clearly copied from the tdb2 backend and incompletely edited.
Signed-off-by: Martin Schwenke <mschwe...@ddn.com>
Reviewed-by: Andreas Schneider <a...@samba.org>
Autobuild-User(master): Martin Schwenke <mart...@samba.org>
Autobuild-Date(master): Mon Jul 10 23:47:12 UTC 2023 on atb-devel-224
commit 3f76b98037d70337b0aeb36566e7a18185e523fc
Author: Martin Schwenke <mschwe...@ddn.com>
Date: Tue Jul 4 10:51:59 2023 +1000
docs-xml: Tweak autorid idmap backend documentation
The name of the placeholder is misleading. It certainly isn't per
domain, so we might as well indicate that it is per range.
Signed-off-by: Martin Schwenke <mschwe...@ddn.com>
Reviewed-by: Andreas Schneider <a...@samba.org>
commit 6989ec3873a099ddaccffe6a4ecc25d544aa5702
Author: Martin Schwenke <mschwe...@ddn.com>
Date: Tue Jul 4 10:55:19 2023 +1000
docs-xml: Fix rid idmap backend documentation
The statement just above the example says the example demonstrates the
use of the base_rid parameter. It doesn't, so fix this.
Also fix a typo.
Signed-off-by: Martin Schwenke <mschwe...@ddn.com>
Reviewed-by: Andreas Schneider <a...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages/idmap_autorid.8.xml | 2 +-
docs-xml/manpages/idmap_rid.8.xml | 3 ++-
docs-xml/manpages/idmap_script.8.xml | 11 +----------
3 files changed, 4 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages/idmap_autorid.8.xml
b/docs-xml/manpages/idmap_autorid.8.xml
index 980718f0bd4..9fe73d5c473 100644
--- a/docs-xml/manpages/idmap_autorid.8.xml
+++ b/docs-xml/manpages/idmap_autorid.8.xml
@@ -59,7 +59,7 @@
</varlistentry>
<varlistentry>
- <term>rangesize = numberofidsperdomain</term>
+ <term>rangesize = numberofidsperrange</term>
<listitem><para>
Defines the number of uids/gids available per
domain range. The minimum needed value is 2000.
diff --git a/docs-xml/manpages/idmap_rid.8.xml
b/docs-xml/manpages/idmap_rid.8.xml
index ade4b78d44d..de2f89d6ca2 100644
--- a/docs-xml/manpages/idmap_rid.8.xml
+++ b/docs-xml/manpages/idmap_rid.8.xml
@@ -28,7 +28,7 @@
</para>
<para>
- NOTE: The idmap_rid backend can NOT bet used as the default backend.
+ NOTE: The idmap_rid backend can NOT be used as the default backend.
One usually needs to define a writeable default idmap range, using
a backend like <parameter>tdb</parameter> or <parameter>ldap</parameter>
that can create unix ids, in order to be able to map the BUILTIN sids
@@ -108,6 +108,7 @@
idmap config TRUSTED : backend = rid
idmap config TRUSTED : range = 50000 - 99999
+ idmap config TRUSTED : base_rid = 500000
</programlisting>
</refsect1>
diff --git a/docs-xml/manpages/idmap_script.8.xml
b/docs-xml/manpages/idmap_script.8.xml
index 5ed1390346d..332eb902c24 100644
--- a/docs-xml/manpages/idmap_script.8.xml
+++ b/docs-xml/manpages/idmap_script.8.xml
@@ -59,20 +59,11 @@
<title>IDMAP SCRIPT</title>
<para>
- The tdb2 idmap backend supports an external program for performing id
mappings
+ The script idmap backend supports an external program for performing id
mappings
through the &smb.conf; option <parameter>idmap config * :
script</parameter> or
its deprecated legacy form <parameter>idmap : script</parameter>.
</para>
- <para>
- The mappings obtained by the script are then stored in the idmap tdb2
- database instead of mappings created by the incrementing id counters.
- It is therefore important that the script covers the complete range of
- SIDs that can be passed in for SID to Unix ID mapping, since otherwise
- SIDs unmapped by the script might get mapped to IDs that had
- previously been mapped by the script.
- </para>
-
<para>
The script should accept the following command line options.
</para>
--
Samba Shared Repository
