Revert the merge of 3.3.0~pre2 in upstream branch

git-svn-id: svn://svn.debian.org/svn/pkg-samba/branches/samba/upstream@2200 fc4039ab-9d04-0410-8cac-899223bdd6b0

1 files changed, 23 insertions, 11 deletions

diff --git a/docs/htmldocs/manpages/idmap_ldap.8.html b/docs/htmldocs/manpages/idmap_ldap.8.html
index 3d25a92de4..0dc38a0c53 100644
--- a/docs/htmldocs/manpages/idmap_ldap.8.html
+++ b/docs/htmldocs/manpages/idmap_ldap.8.html
@@ -31,25 +31,37 @@
 			Specifies the LDAP server to which modify/add/delete requests should
 			be sent.  If not defined, idmap_ldap will assume that ldap://localhost/
 			should be used.
-		</p></dd></dl></div></div><div class="refsect1" lang="en"><a name="id2482448"></a><h2>EXAMPLES</h2><p>
-	The follow sets of a LDAP configuration which uses two LDAP
-	directories, one for storing the ID mappings and one for retrieving
-	new IDs.
+		</p></dd><dt><span class="term">range = low - high</span></dt><dd><p>
+			Defines the available matching uid and gid range from which
+			winbindd can allocate for users and groups.  If the parameter
+			is absent, Winbind fail over to use the "idmap uid"
+			and "idmap gid" options from smb.conf.
+                </p></dd></dl></div></div><div class="refsect1" lang="en"><a name="id2482463"></a><h2>EXAMPLES</h2><p>
+	The follow sets of a LDAP configuration which uses a slave server
+	running on localhost for fast fetching SID/gid/uid mappings, it
+	implies correct configuration of referrals.
+	The idmap alloc backend is pointed directly to the master to skip
+	the referral (and consequent reconnection to the master) that the
+	slave would return as allocation requires writing on the master.
 	</p><pre class="programlisting">
 	[global]
-	idmap backend = ldap:ldap://localhost/
-	idmap uid = 1000000-1999999
-	idmap gid = 1000000-1999999
+	    idmap domains = ALLDOMAINS
+	    idmap config ALLDOMAINS:default      = yes
+	    idmap config ALLDOMAINS:backend      = ldap
+	    idmap config ALLDOMAINS:ldap_base_dn = ou=idmap,dc=example,dc=com
+	    idmap config ALLDOMAINS:ldap_url     = ldap://localhost/
+	    idmap config ALLDOMAINS:range        = 10000 - 50000
 
-	idmap alloc backend = ldap
-	idmap alloc config : ldap_url	= ldap://id-master/
-	idmap alloc config : ldap_base_dn = ou=idmap,dc=example,dc=com
+	    idmap alloc backend = ldap
+	    idmap alloc config:ldap_base_dn = ou=idmap,dc=example,dc=com
+	    idmap alloc config:ldap_url     = ldap://master.example.com/
+	    idmap alloc config:range        = 10000 - 50000
 	</pre></div><div class="refsynopsisdiv"><h2>NOTE</h2><p>In order to use authentication against ldap servers you may
 	need to provide a DN and a password. To avoid exposing the password
 	in plain text in the configuration file we store it into a security
 	store. The "net idmap " command is used to store a secret
 	for the DN specified in a specific idmap domain.
-	</p></div><div class="refsect1" lang="en"><a name="id2482490"></a><h2>AUTHOR</h2><p>
+	</p></div><div class="refsect1" lang="en"><a name="id2482509"></a><h2>AUTHOR</h2><p>
 	The original Samba software and related utilities
 	were created by Andrew Tridgell. Samba is now developed
 	by the Samba Team as an Open Source project similar