[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-20-g816934f

Michael Adam obnox at samba.org
Wed Jan 21 09:55:30 GMT 2009


The branch, master has been updated
       via  816934faa8bbe53dd299bc5e39f471eafdddefa8 (commit)
       via  665b5dc70333ca36129a6fe06645bd9faa4f2350 (commit)
       via  65b79200e46751278c125ad260d899d10d6466a2 (commit)
       via  bd252ad665547d2ad012725ccb18720e160d221f (commit)
      from  d965ff05c9923c8a0e440e905d0d9fe662cc5db0 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 816934faa8bbe53dd299bc5e39f471eafdddefa8
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jan 21 10:56:34 2009 +0100

    s3:docs: clarify explanation of the allocator in the idmap_ldap manpage
    
    Michael

commit 665b5dc70333ca36129a6fe06645bd9faa4f2350
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jan 21 10:55:19 2009 +0100

    s3:docs: clarify explanation of the allocator in the idmap_tdb manpage
    
    Michael

commit 65b79200e46751278c125ad260d899d10d6466a2
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jan 21 10:49:48 2009 +0100

    s3:docs: clarify explanation of allocator in the idmap_tdb2 manpage
    
    Michael

commit bd252ad665547d2ad012725ccb18720e160d221f
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jan 21 10:38:49 2009 +0100

    s3:docs: fix copy and paste error in the idmap_tdb2 manpage
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/manpages-3/idmap_ldap.8.xml |   10 ++++++++--
 docs-xml/manpages-3/idmap_tdb.8.xml  |   14 ++++++++++----
 docs-xml/manpages-3/idmap_tdb2.8.xml |   11 ++++++-----
 3 files changed, 24 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/idmap_ldap.8.xml b/docs-xml/manpages-3/idmap_ldap.8.xml
index ea9e5bf..0c8fa3c 100644
--- a/docs-xml/manpages-3/idmap_ldap.8.xml
+++ b/docs-xml/manpages-3/idmap_ldap.8.xml
@@ -22,9 +22,15 @@
 	<para>The idmap_ldap plugin provides a means for Winbind to
 	store and retrieve SID/uid/gid mapping tables in an LDAP directory
 	service.
+	</para>
+
+	<para>
 	In contrast to read only backends like idmap_rid, it is an allocating
-	backend: This means that it needs to allocate new user and group IDs to
-	create new mappings as requests to yet unmapped users are answered.
+	backend: This means that it needs to allocate new user and group IDs in
+	order to create new mappings. The allocator can be provided by the
+	idmap_ldap backend itself or by any other allocating backend like
+	idmap_tdb or idmap_tdb2. This is configured with the
+	parameter <parameter>idmap alloc backend</parameter>.
 	</para>
 
 	<para>
diff --git a/docs-xml/manpages-3/idmap_tdb.8.xml b/docs-xml/manpages-3/idmap_tdb.8.xml
index fb23076..2b4c050 100644
--- a/docs-xml/manpages-3/idmap_tdb.8.xml
+++ b/docs-xml/manpages-3/idmap_tdb.8.xml
@@ -21,10 +21,16 @@
 
 	<para>
 	The idmap_tdb plugin is the default backend used by winbindd
-	for storing SID/uid/gid mapping tables. In contrast to read only
-	backends like idmap_rid, it is an allocating backend:
-	This means that it needs to allocate new user and group IDs
-	to create new mappings as requests to yet unmapped users are answered.
+	for storing SID/uid/gid mapping tables.
+	</para>
+
+	<para>
+	In contrast to read only backends like idmap_rid, it is an allocating
+	backend: This means that it needs to allocate new user and group IDs in
+	order to create new mappings. The allocator can be provided by the
+	idmap_tdb backend itself or by any other allocating backend like
+	idmap_ldap or idmap_tdb2. This is configured with the
+	parameter <parameter>idmap alloc backend</parameter>.
 	</para>
 
 	<para>
diff --git a/docs-xml/manpages-3/idmap_tdb2.8.xml b/docs-xml/manpages-3/idmap_tdb2.8.xml
index 6b303b4..4f19ba1 100644
--- a/docs-xml/manpages-3/idmap_tdb2.8.xml
+++ b/docs-xml/manpages-3/idmap_tdb2.8.xml
@@ -26,10 +26,12 @@
 	</para>
 
 	<para>
-	In contrast to read only
-	backends like idmap_rid, it is an allocating backend:
-	This means that it needs to allocate new user and group IDs
-	to create new mappings as requests to yet unmapped users are answered.
+	In contrast to read only backends like idmap_rid, it is an allocating
+	backend: This means that it needs to allocate new user and group IDs in
+	order to create new mappings. The allocator can be provided by the
+	idmap_tdb2 backend itself or by any other allocating backend like
+	idmap_tdb or idmap_ldap. This is configured with the
+	parameter <parameter>idmap alloc backend</parameter>.
 	</para>
 
 	<para>
@@ -111,7 +113,6 @@
 
 	<programlisting>
 	[global]
-	# "idmap backend = tdb2" is redundant here since it is the default
 	idmap backend = tdb2
 	idmap uid = 1000000-2000000
 	idmap gid = 1000000-2000000


-- 
Samba Shared Repository


More information about the samba-cvs mailing list