Adding idmap uid/gid smb.conf man page entries. Marking winbind uid/gid as deprecated.

(This used to be commit 8bfaf39680ea1fa2a347fa19052f69d6789ed99d)

diff --git a/docs/docbook/smbdotconf/winbind/idmapgid.xml b/docs/docbook/smbdotconf/winbind/idmapgid.xml
new file mode 100644 (file)
index 0000000..8bd46a8
--- /dev/null
+++ b/docs/docbook/smbdotconf/winbind/idmapgid.xml
@@ -0,0 +1,18 @@
+<samba:parameter name="idmap gid"
+                 context="G"
+                 advanced="1" developer="1" hide="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+
+       <para>The idmap gid parameter specifies the range of group ids that are allocated for
+       the purpose of mapping UNX groups to NT group SIDs. This range of group ids should have no 
+       existing local or NIS groups within it as strange conflicts can occur otherwise.</para>
+
+       <para>The availability of an idmap gid range is essential for correct operation of
+       all group mapping.</para>
+
+       <para>Default: <command moreinfo="none">idmap gid = &lt;empty string&gt;</command></para>
+
+       <para>Example: <command moreinfo="none">idmap gid = 10000-20000</command></para>
+</listitem>
+</samba:parameter>

diff --git a/docs/docbook/smbdotconf/winbind/idmapuid.xml b/docs/docbook/smbdotconf/winbind/idmapuid.xml
new file mode 100644 (file)
index 0000000..5e6a245
--- /dev/null
+++ b/docs/docbook/smbdotconf/winbind/idmapuid.xml
@@ -0,0 +1,14 @@
+<samba:parameter name="idmap uid"
+                 context="G"
+                 advanced="1" developer="1" hide="1"
+                 xmlns:samba="http://samba.org/common">
+<listitem>
+       <para>The idmap uid parameter specifies the range of user ids that are allocated for use
+       in mapping UNIX users to NT user SIDs. This range of ids should have no existing local
+       or NIS users within it as strange conflicts can occur otherwise.</para>
+
+       <para>Default: <command moreinfo="none">idmap uid = &lt;empty string&gt;</command></para>
+               
+       <para>Example: <command moreinfo="none">idmap uid = 10000-20000</command></para>
+</listitem>
+</samba:parameter>

diff --git a/docs/docbook/smbdotconf/winbind/winbindgid.xml b/docs/docbook/smbdotconf/winbind/winbindgid.xml
index a8414e9e8c0d219e8e30c7f238fa75596a3fe41b..e00e576389256749a05dad98bb313266c65c0b6b 100644 (file)
--- a/docs/docbook/smbdotconf/winbind/winbindgid.xml
+++ b/docs/docbook/smbdotconf/winbind/winbindgid.xml
@@ -3,6 +3,8 @@
                  advanced="1" developer="1" hide="1"
                  xmlns:samba="http://samba.org/common">
 <listitem>
+       <para>This parameter is now an alias for <command moreinfo="none">idmap gid</command></para>
+
        <para>The winbind gid parameter specifies the range of group 
        ids that are allocated by the <citerefentry><refentrytitle>winbindd</refentrytitle>
        <manvolnum>8</manvolnum></citerefentry> daemon.  This range of group ids should have no 

diff --git a/docs/docbook/smbdotconf/winbind/winbinduid.xml b/docs/docbook/smbdotconf/winbind/winbinduid.xml
index 6fee40fcb850140b0bd6d7237237504b2d3bc177..0f61bac13c831c79dd35cc4b7c4786940599069f 100644 (file)
--- a/docs/docbook/smbdotconf/winbind/winbinduid.xml
+++ b/docs/docbook/smbdotconf/winbind/winbinduid.xml
@@ -3,11 +3,12 @@
                  advanced="1" developer="1" hide="1"
                  xmlns:samba="http://samba.org/common">
 <listitem>
-       <para>The winbind gid parameter specifies the range of group 
-       ids that are allocated by the <citerefentry><refentrytitle>winbindd</refentrytitle>
-       <manvolnum>8</manvolnum></citerefentry> daemon.  This range of ids should have no 
-       existing local or NIS users within it as strange conflicts can 
-       occur otherwise.</para>
+       <para>This parameter is now an alias for <command moreinfo="none">idmap uid</command></para>
+
+       <para>The winbind gid parameter specifies the range of user ids that are allocated by the
+       <citerefentry><refentrytitle>winbindd</refentrytitle> <manvolnum>8</manvolnum></citerefentry>
+       daemon.  This range of ids should have no existing local or NIS users within it as strange
+       conflicts can occur otherwise.</para>
 
        <para>Default: <command moreinfo="none">winbind uid = &lt;empty string&gt;</command></para>