diff -urN ../../samba-3.2.8/docs-xml/manpages-3/cifs.upcall.8.xml manpages-3/cifs.upcall.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/cifs.upcall.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/cifs.upcall.8.xml	Tue Feb 24 16:38:16 2009
@@ -8,7 +8,7 @@
         <manvolnum>8</manvolnum>
         <refmiscinfo class="source">Samba</refmiscinfo>
         <refmiscinfo class="manual">System Administration tools</refmiscinfo>
-        <refmiscinfo class="version">3.2</refmiscinfo>
+        <refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 <refnamediv>
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/eventlogadm.8.xml manpages-3/eventlogadm.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/eventlogadm.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/eventlogadm.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/findsmb.1.xml manpages-3/findsmb.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/findsmb.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/findsmb.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/idmap_ad.8.xml manpages-3/idmap_ad.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/idmap_ad.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/idmap_ad.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
@@ -58,8 +58,8 @@
 	<title>EXAMPLES</title>
 	<para>
 	The following example shows how to retrieve idmappings from our principal and
-	and trusted AD domains. All is needed is to set default to yes. If trusted
-	domains are present id conflicts must be resolved beforehand, there is no
+	and trusted AD domains. If trusted domains are present id conflicts must be
+	resolved beforehand, there is no
 	guarantee on the order conflicting mappings would be resolved at this point.
 
 	This example also shows how to leave a small non conflicting range for local
@@ -68,13 +68,12 @@
 
 	<programlisting>
 	[global]
-	idmap domains = ALLDOMAINS
-	idmap config ALLDOMAINS:backend      = ad
-	idmap config ALLDOMAINS:default      = yes
-	idmap config ALLDOMAINS:range        = 10000 - 300000000
+	idmap backend = tdb
+	idmap uid = 1000000-1999999
+	idmap gid = 1000000-1999999
 
-	idmap alloc backend = tdb
-	idmap alloc config:range        = 5000 - 9999
+	idmap config CORP : backend  = ad
+	idmap config CORP : range = 1000-999999
 	</programlisting>
 </refsect1>
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/idmap_adex.8.xml manpages-3/idmap_adex.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/idmap_adex.8.xml	Thu Jan  1 09:00:00 1970
+++ manpages-3/idmap_adex.8.xml	Tue Feb 24 16:38:16 2009
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="idmap_adex.8">
+
+<refmeta>
+	<refentrytitle>idmap_adex</refentrytitle>
+	<manvolnum>8</manvolnum>
+	<refmiscinfo class="source">Samba</refmiscinfo>
+	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+	<refname>idmap_adex</refname>
+	<refpurpose>Samba's idmap_adex Backend for Winbind</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<title>DESCRIPTION</title>
+	<para>
+	  The idmap_adex plugin provides a way for Winbind to read
+	  id mappings from an AD server that uses RFC2307 schema
+	  extensions. This module implements both the idmap and nss_info
+	  APIs and supports domain trustes as well as two-way cross
+	  forest trusts.  It is a read-only plugin requiring that the
+	  administrator provide mappings in advance by adding the
+	  POSIX attribute information to the users and groups objects
+	  in AD.  The most common means of doing this is using &quot;Identity
+	  Services for Unix&quot; support on Windows 2003 R2 and later.
+	</para>
+
+	<para>
+	  Note that you must add the uidNumber, gidNumber, and uid
+	  attributes to the partial attribute set of the forest global
+	  catalog servers.  This can be done using the Active Directory Schema
+	  Management MMC plugin (schmmgmt.dll).
+	</para>
+</refsynopsisdiv>
+
+<refsynopsisdiv>
+	<title>NSS_INFO</title>
+	<para>
+	  The nss_info plugin supports reading the unixHomeDirectory,
+	  gidNumber, loginShell, and uidNumber attributes from the user
+	  object and the gidNumber attribute from the group object to
+	  fill in information required by the libc getpwnam() and
+	  getgrnam() family of functions.  Group membership is filled in
+	  according to the Windows group membership and not the
+	  msSFU30PosixMember attribute.
+	</para>
+
+	<para>
+	  Username aliases are implement by setting the uid attribute
+	  on the user object.  While group name aliases are implemented
+	  by reading the displayname attribute from the group object.
+	</para>
+</refsynopsisdiv>
+
+<refsect1>
+	<title>EXAMPLES</title>
+	<para>
+	  The following example shows how to retrieve idmappings and NSS data
+	  from our principal and trusted AD domains.
+	</para>
+
+	<programlisting>
+	[global]
+	idmap backend = adex
+	idmap uid = 1000-4000000000
+	idmap gid = 1000-4000000000
+
+	winbind nss info = adex
+	winbind normalize names = yes
+	</programlisting>
+</refsect1>
+
+<refsect1>
+	<title>AUTHOR</title>
+
+	<para>
+	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
+	to the way the Linux kernel is developed.
+	</para>
+</refsect1>
+
+</refentry>
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/idmap_hash.8.xml manpages-3/idmap_hash.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/idmap_hash.8.xml	Thu Jan  1 09:00:00 1970
+++ manpages-3/idmap_hash.8.xml	Tue Feb 24 16:38:16 2009
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="idmap_hash.8">
+
+<refmeta>
+	<refentrytitle>idmap_hash</refentrytitle>
+	<manvolnum>8</manvolnum>
+	<refmiscinfo class="source">Samba</refmiscinfo>
+	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+	<refname>idmap_hash</refname>
+	<refpurpose>Samba's idmap_hash Backend for Winbind</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<title>DESCRIPTION</title>
+	<para>The idmap_hash plugin implements a hashing algorithm used
+	  map SIDs for domain users and groups to a 31-bit uid and gid.
+	  This plugin also implements the nss_info API and can be used
+	  to support a local name mapping files if enabled via the
+	  &quot;winbind normlaize names&quot; and &quot;winbind nss info&quot;
+	  parameters in smb.conf.
+	</para>
+</refsynopsisdiv>
+
+<refsect1>
+	<title>IDMAP OPTIONS</title>
+
+	<variablelist>
+		<varlistentry>
+		<term>name_map</term>
+		<listitem><para>
+		    Specifies the absolute path to the name mapping
+		    file used by the nss_info API.  Entries in the file
+		    are of the form &quot;<replaceable>unix name</replaceable>
+		    = <replaceable>qualified domain name</replaceable>&quot;.
+		    Mapping of both user and group names is supported.
+		</para></listitem>
+		</varlistentry>
+	</variablelist>
+</refsect1>
+
+<refsect1>
+	<title>EXAMPLES</title>
+	<para>The following example utilizes the idmap_hash plugin for
+	  the idmap and nss_info information.
+	</para>
+
+	<programlisting>
+	[global]
+	idmap backend = hash
+	idmap uid = 1000-4000000000
+	idmap gid = 1000-4000000000
+
+	winbind nss info = hash
+	winbind normalize names = yes
+	idmap_hash:name_map = /etc/samba/name_map.cfg
+	</programlisting>
+</refsect1>
+
+<refsect1>
+	<title>AUTHOR</title>
+
+	<para>
+	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
+	to the way the Linux kernel is developed.
+	</para>
+</refsect1>
+
+</refentry>
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/idmap_ldap.8.xml manpages-3/idmap_ldap.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/idmap_ldap.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/idmap_ldap.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
@@ -21,8 +21,31 @@
 
 	<para>The idmap_ldap plugin provides a means for Winbind to
 	store and retrieve SID/uid/gid mapping tables in an LDAP directory
-	service.  The module implements both the &quot;idmap&quot; and
-	&quot;idmap alloc&quot; APIs.
+	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 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>
+	Note that in order for this (or any other allocating) backend to
+	function at all, the default backend needs to be writeable.
+	The ranges used for uid and gid allocation are the default ranges
+	configured by &quot;idmap uid&quot; and &quot;idmap gid&quot;.
+	</para>
+
+	<para>
+	Furthermore, since there is only one global allocating backend
+	responsible for all domains using writeable idmap backends,
+	any explicitly configured domain with idmap backend ldap
+	should have the same range as the default range, since it needs
+	to use the global uid / gid allocator. See the example below.
 	</para>
 </refsynopsisdiv>
 
@@ -60,11 +83,10 @@
 		<term>range = low - high</term>
                 <listitem><para>
 			Defines the available matching uid and gid range for which the
-			backend is authoritative.  Note that the range commonly matches
-			the allocation range due to the fact that the same backend will
-			store and retrieve SID/uid/gid mapping entries.  If the parameter
-			is absent, Winbind fail over to use the &quot;idmap uid&quot; and
-			&quot;idmap gid&quot; options from smb.conf.
+			backend is authoritative.
+			If the parameter is absent, Winbind fails over to use the
+			&quot;idmap uid&quot; and &quot;idmap gid&quot; options
+			from smb.conf.
                 </para></listitem>
                 </varlistentry>
 	</variablelist>
@@ -99,16 +121,6 @@
 			should be used.
 		</para></listitem>
 		</varlistentry>
-
-                <varlistentry>
-		<term>range = low - high</term>
-                <listitem><para>
-			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 &quot;idmap uid&quot;
-			and &quot;idmap gid&quot; options from smb.conf.
-                </para></listitem>
-                </varlistentry>
 	</variablelist>
 </refsect1>
 
@@ -116,27 +128,20 @@
 	<title>EXAMPLES</title>
 
 	<para>
-	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.
+	The follow sets of a LDAP configuration which uses two LDAP
+	directories, one for storing the ID mappings and one for retrieving
+	new IDs.
 	</para>
 
 	<programlisting>
 	[global]
-	    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_base_dn = ou=idmap,dc=example,dc=com
-	    idmap alloc config:ldap_url     = ldap://master.example.com/
-	    idmap alloc config:range        = 10000 - 50000
+	idmap backend = ldap:ldap://localhost/
+	idmap uid = 1000000-1999999
+	idmap gid = 1000000-1999999
+
+	idmap alloc backend = ldap
+	idmap alloc config : ldap_url	= ldap://id-master/
+	idmap alloc config : ldap_base_dn = ou=idmap,dc=example,dc=com
 	</programlisting>
 </refsect1>
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/idmap_nss.8.xml manpages-3/idmap_nss.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/idmap_nss.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/idmap_nss.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
@@ -38,17 +38,12 @@
 
 	<programlisting>
 	[global]
-	    idmap domains = SAMBA TRUSTEDDOMAINS
+	idmap backend = tdb
+	idmap uid = 1000000-1999999
+	idmap gid = 1000000-1999999
 
-	    idmap config SAMBA:backend  = nss
-	    idmap config SAMBA:readonly = yes
-
-	    idmap config TRUSTEDDOMAINS:default = yes
-	    idmap config TRUSTEDDOMAINS:backend = tdb
-	    idmap config TRUSTEDDOMAINS:range   = 10000 - 50000
-
-	    idmap alloc backend      = tdb
-	    idmap alloc config:range = 10000 - 50000
+	idmap config SAMBA : backend  = nss
+	idmap config SAMBA : range = 1000-999999
 	</programlisting>
 </refsect1>
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/idmap_rid.8.xml manpages-3/idmap_rid.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/idmap_rid.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/idmap_rid.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
@@ -47,6 +47,9 @@
 			by default start at 1000 (512 hexadecimal), this means a good value
 			for base_rid can be 1000 as the resulting ID is calculated this way:
 			ID = RID - BASE_RID + LOW RANGE ID.
+		</para>
+		<para>
+			Use of this parameter is deprecated.
 		</para></listitem>
 		</varlistentry>
 	</variablelist>
@@ -54,19 +57,16 @@
 
 <refsect1>
 	<title>EXAMPLES</title>
-	<para>This example shows how to configure 2 domains with idmap_rid</para>
+	<para>This example shows how to configure a domain with idmap_rid</para>
 
 	<programlisting>
 	[global]
-	    idmap domains = MAIN TRUSTED1
+	idmap backend = tdb
+	idmap uid = 1000000-1999999
+	idmap gid = 1000000-1999999
 
-	    idmap config MAIN:backend      = rid
-	    idmap config MAIN:base_rid     = 0
-	    idmap config MAIN:range        = 10000 - 49999
-
-	    idmap config TRUSTED1:backend  = rid
-	    idmap config TRUSTED1:base_rid = 1000
-	    idmap config TRUSTED1:range    = 50000 - 99999
+	idmap config TRUSTED : backend  = rid
+	idmap config TRUSTED : range    = 50000 - 99999
 	</programlisting>
 </refsect1>
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/idmap_tdb.8.xml manpages-3/idmap_tdb.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/idmap_tdb.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/idmap_tdb.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
@@ -19,9 +19,33 @@
 <refsynopsisdiv>
 	<title>DESCRIPTION</title>
 
-	<para>The idmap_tdb plugin is the default backend used by winbindd
-	for storing SID/uid/gid mapping tables and implements
-	both the &quot;idmap&quot; and &quot;idmap alloc&quot; APIs.
+	<para>
+	The idmap_tdb plugin is the default backend used by winbindd
+	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>
+	Note that in order for this (or any other allocating) backend to
+	function at all, the default backend needs to be writeable.
+	The ranges used for uid and gid allocation are the default ranges
+	configured by &quot;idmap uid&quot; and &quot;idmap gid&quot;.
+	</para>
+
+	<para>
+	Furthermore, since there is only one global allocating backend
+	responsible for all domains using writeable idmap backends,
+	any explicitly configured domain with idmap backend tdb
+	should have the same range as the default range, since it needs
+	to use the global uid / gid allocator. See the example below.
 	</para>
 </refsynopsisdiv>
 
@@ -33,49 +57,52 @@
 		<term>range = low - high</term>
                 <listitem><para>
 			Defines the available matching uid and gid range for which the
-			backend is authoritative.  Note that the range commonly matches
-			the allocation range due to the fact that the same backend will
-			store and retrieve SID/uid/gid mapping entries.  If the parameter
-			is absent, Winbind fail over to use the &quot;idmap uid&quot; and
-			&quot;idmap gid&quot; options from smb.conf.
+			backend is authoritative.
+			If the parameter is absent, Winbind fails over to use
+			the &quot;idmap uid&quot; and &quot;idmap gid&quot; options
+			from smb.conf.
                 </para></listitem>
                 </varlistentry>
 	</variablelist>
 </refsect1>
 
 <refsect1>
-	<title>IDMAP ALLOC OPTIONS</title>
+	<title>EXAMPLES</title>
 
-	<variablelist>
-                <varlistentry>
-		<term>range = low - high</term>
-                <listitem><para>
-			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 &quot;idmap uid&quot;
-			and &quot;idmap gid&quot; options from smb.conf.
-                </para></listitem>
-                </varlistentry>
-	</variablelist>
-</refsect1>
+	<para>
+	This example shows how tdb is used as a the default idmap backend.
+	It configures the idmap range through the global options for all
+	domains encountered. This same range is used for uid/gid allocation.
+	</para>
 
-<refsect1>
-	<title>EXAMPLES</title>
+	<programlisting>
+	[global]
+	# "idmap backend = tdb" is redundant here since it is the default
+	idmap backend = tdb
+	idmap uid = 1000000-2000000
+	idmap gid = 1000000-2000000
+	</programlisting>
 
 	<para>
-	The following example is equivalent to the pre-3.0.25 default idmap
-	configuration using the &quot;idmap backend = tdb&quot; setting.
+	This (rather theoretical) example shows how tdb can be used as the
+	allocating backend while ldap is the default backend used to store
+	the mappings.
+	It adds an explicit configuration for some domain DOM1, that
+	uses the tdb idmap backend. Note that the same range as the
+	default uid/gid range is used, since the allocator has to serve
+	both the default backend and the explicitly configured domain DOM1.
 	</para>
 
 	<programlisting>
 	[global]
-	    idmap domains = ALLDOMAINS
-	    idmap config ALLDOMAINS:default = yes
-	    idmap config ALLDOMAINS:backend = tdb
-	    idmap config ALLDOMAINS:range   = 10000 - 50000
+	idmap backend = ldap
+	idmap uid = 1000000-2000000
+	idmap gid = 1000000-2000000
+	# use a different uid/gid allocator:
+	idmap alloc backend = tdb
 
-	    idmap alloc backend = tdb
-	    idmap alloc config:range = 10000 - 50000
+	idmap config DOM1 : backend = tdb
+	idmap config DOM1 : range = 1000000-2000000
 	</programlisting>
 </refsect1>
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/idmap_tdb2.8.xml manpages-3/idmap_tdb2.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/idmap_tdb2.8.xml	Thu Jan  1 09:00:00 1970
+++ manpages-3/idmap_tdb2.8.xml	Tue Feb 24 16:38:16 2009
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="idmap_tdb2.8">
+
+<refmeta>
+	<refentrytitle>idmap_tdb2</refentrytitle>
+	<manvolnum>8</manvolnum>
+	<refmiscinfo class="source">Samba</refmiscinfo>
+	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+	<refname>idmap_tdb2</refname>
+	<refpurpose>Samba's idmap_tdb2 Backend for Winbind</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<title>DESCRIPTION</title>
+
+	<para>
+	The idmap_tdb2 plugin is a substitute for the default idmap_tdb
+	backend used by winbindd for storing SID/uid/gid mapping tables
+	in clustered environments with Samba and CTDB.
+	</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_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>
+	Note that in order for this (or any other allocating) backend to
+	function at all, the default backend needs to be writeable.
+	The ranges used for uid and gid allocation are the default ranges
+	configured by &quot;idmap uid&quot; and &quot;idmap gid&quot;.
+	</para>
+
+	<para>
+	Furthermore, since there is only one global allocating backend
+	responsible for all domains using writeable idmap backends,
+	any explicitly configured domain with idmap backend tdb2
+	should have the same range as the default range, since it needs
+	to use the global uid / gid allocator. See the example below.
+	</para>
+</refsynopsisdiv>
+
+<refsect1>
+	<title>IDMAP OPTIONS</title>
+
+	<variablelist>
+		<varlistentry>
+		<term>range = low - high</term>
+		<listitem><para>
+			Defines the available matching uid and gid range for which the
+			backend is authoritative.
+			If the parameter is absent, Winbind fails over to use
+			the &quot;idmap uid&quot; and &quot;idmap gid&quot; options
+			from smb.conf.
+		</para></listitem>
+		</varlistentry>
+	</variablelist>
+</refsect1>
+
+<refsect1>
+	<title>IDMAP SCRIPT</title>
+
+	<para>
+	The tdb2 idmap backend supports a script for performing id mappings
+	through the smb.conf option <parameter>idmap : script</parameter>.
+	The script should accept the following command line options.
+	</para>
+
+	<programlisting>
+	SIDTOID S-1-xxxx
+	IDTOSID UID xxxx
+	IDTOSID GID xxxx
+	</programlisting>
+
+	<para>
+	And it should return one of the following responses as a single line of
+	text.
+	</para>
+
+	<programlisting>
+	UID:yyyy
+	GID:yyyy
+	SID:yyyy
+	ERR:yyyy
+	</programlisting>
+
+	<para>
+	Note that the script should cover 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>
+</refsect1>
+
+<refsect1>
+	<title>EXAMPLES</title>
+
+	<para>
+	This example shows how tdb2 is used as a the default idmap backend.
+	It configures the idmap range through the global options for all
+	domains encountered. This same range is used for uid/gid allocation.
+	</para>
+
+	<programlisting>
+	[global]
+	idmap backend = tdb2
+	idmap uid = 1000000-2000000
+	idmap gid = 1000000-2000000
+	</programlisting>
+</refsect1>
+
+<refsect1>
+	<title>AUTHOR</title>
+
+	<para>
+	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
+	to the way the Linux kernel is developed.
+	</para>
+</refsect1>
+
+</refentry>
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/ldb.3.xml manpages-3/ldb.3.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/ldb.3.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/ldb.3.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>3</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">C Library Functions</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 <refnamediv>
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/ldbadd.1.xml manpages-3/ldbadd.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/ldbadd.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/ldbadd.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/ldbdel.1.xml manpages-3/ldbdel.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/ldbdel.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/ldbdel.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/ldbedit.1.xml manpages-3/ldbedit.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/ldbedit.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/ldbedit.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
     </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/ldbmodify.1.xml manpages-3/ldbmodify.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/ldbmodify.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/ldbmodify.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/ldbrename.1.xml manpages-3/ldbrename.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/ldbrename.1.xml	Thu Jan  1 09:00:00 1970
+++ manpages-3/ldbrename.1.xml	Tue Feb 24 16:38:16 2009
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<refentry id="ldbrename.1">
+
+<refmeta>
+	<refentrytitle>ldbrename</refentrytitle>
+	<manvolnum>1</manvolnum>
+</refmeta>
+
+
+<refnamediv>
+	<refname>ldbrename</refname>
+	<refpurpose>Edit LDB databases using your favorite editor</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<cmdsynopsis>
+		<command>ldbrename</command>
+		<arg choice="opt">-h</arg>
+		<arg choice="opt">-o options</arg>
+		<arg choice="req">olddn</arg>
+		<arg choice="req">newdb</arg>
+	</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+	<title>DESCRIPTION</title>
+
+	<para>ldbrename is a utility that allows you to rename trees in 
+		an LDB database based by DN. This utility takes 
+		two arguments: the original 
+		DN name of the top element and the DN to change it to.
+	</para>
+
+</refsect1>
+
+
+<refsect1>
+	<title>OPTIONS</title>
+
+	<variablelist>
+		<varlistentry>
+		<term>-h</term>
+		<listitem><para>
+		Show list of available options.</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+			<term>-H &lt;ldb-url&gt;</term>
+			<listitem><para>
+				LDB URL to connect to. See ldb(7) for details.
+			</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+			<term>-o options</term>
+			<listitem><para>Extra ldb options, such as 
+			modules.</para></listitem>
+		</varlistentry>
+		
+	</variablelist>
+	
+</refsect1>
+
+<refsect1>
+	<title>ENVIRONMENT</title>
+
+	<variablelist>
+		<varlistentry><term>LDB_URL</term>
+			<listitem><para>LDB URL to connect to (can be overrided by using the 
+					-H command-line option.)</para></listitem>
+		</varlistentry>
+	</variablelist>
+	
+</refsect1>
+
+<refsect1>
+	<title>VERSION</title>
+
+	<para>This man page is correct for version 4.0 of the Samba suite.</para>
+</refsect1>
+
+<refsect1>
+	<title>SEE ALSO</title>
+
+	<para>ldb(7), ldbmodify, ldbdel, ldif(5)</para>
+
+</refsect1>
+
+<refsect1>
+	<title>AUTHOR</title>
+
+	<para> ldb was written by 
+		 <ulink url="http://samba.org/~tridge/">Andrew Tridgell</ulink>.
+	</para>
+
+	<para>
+If you wish to report a problem or make a suggestion then please see
+the <ulink url="http://ldb.samba.org/"/> web site for
+current contact and maintainer information.
+	</para>
+
+	<para>This manpage was written by Jelmer Vernooij.</para>
+	
+</refsect1>
+
+</refentry>
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/ldbsearch.1.xml manpages-3/ldbsearch.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/ldbsearch.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/ldbsearch.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/libsmbclient.7.xml manpages-3/libsmbclient.7.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/libsmbclient.7.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/libsmbclient.7.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>7</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">7</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/lmhosts.5.xml manpages-3/lmhosts.5.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/lmhosts.5.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/lmhosts.5.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>5</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/log2pcap.1.xml manpages-3/log2pcap.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/log2pcap.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/log2pcap.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/mount.cifs.8.xml manpages-3/mount.cifs.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/mount.cifs.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/mount.cifs.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
@@ -140,7 +140,7 @@
                 same domain (e.g. running winbind or nss_ldap) and
                 the server supports the Unix Extensions then the uid
                 and gid can be retrieved from the server (and uid
-                and gid would not have to be specifed on the mount. 
+                and gid would not have to be specified on the mount.
                 For servers which do not support the CIFS Unix
                 extensions, the default uid (and gid) returned on lookup 
                 of existing files will be the uid (gid) of the person
@@ -372,9 +372,9 @@
                 <term>noacl</term>
                 <listitem><para>Do not allow POSIX ACL operations even if server would support them.</para><para>
 		The CIFS client can get and set POSIX ACLs (getfacl, setfacl) to Samba servers
-		version 3.10 and later.  Setting POSIX ACLs requires enabling both XATTR and
+		version 3.0.10 and later.  Setting POSIX ACLs requires enabling both XATTR and
 		then POSIX support in the CIFS configuration options when building the cifs
-		module.  POSIX ACL support can be disabled on a per mount basic by specifying
+		module.  POSIX ACL support can be disabled on a per mount basis by specifying
 		"noacl" on mount.</para>
 		</listitem>
 	</varlistentry>
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/net.8.xml manpages-3/net.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/net.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/net.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
@@ -850,7 +850,20 @@
 <para>Export users, aliases and groups from remote server to 
 local server.  You need to run this against the PDC, from a Samba machine joined as a BDC. 
 </para>
+</refsect2>
+
+<refsect2>
+<title>RPC VAMPIRE KEYTAB</title>
 
+<para>Dump remote SAM database to local Kerberos keytab file.
+</para>
+</refsect2>
+
+<refsect2>
+<title>RPC VAMPIRE LDIF</title>
+
+<para>Dump remote SAM database to local LDIF file or standard output.
+</para>
 </refsect2>
 
 <refsect2>
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/nmbd.8.xml manpages-3/nmbd.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/nmbd.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/nmbd.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/nmblookup.1.xml manpages-3/nmblookup.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/nmblookup.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/nmblookup.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/ntlm_auth.1.xml manpages-3/ntlm_auth.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/ntlm_auth.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/ntlm_auth.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/pam_winbind.7.xml manpages-3/pam_winbind.7.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/pam_winbind.7.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/pam_winbind.7.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>7</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">7</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
@@ -131,6 +131,14 @@
 		<term>silent</term>
 		<listitem><para>
 		Do not emit any messages.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>mkhomedir</term>
+		<listitem><para>
+		Create homedirectory for a user on-the-fly, option is valid in
+		PAM session block.
 		</para></listitem>
 		</varlistentry>
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/pdbedit.8.xml manpages-3/pdbedit.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/pdbedit.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/pdbedit.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/profiles.1.xml manpages-3/profiles.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/profiles.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/profiles.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/rpcclient.1.xml manpages-3/rpcclient.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/rpcclient.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/rpcclient.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/samba.7.xml manpages-3/samba.7.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/samba.7.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/samba.7.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>7</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">Miscellanea</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/sharesec.1.xml manpages-3/sharesec.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/sharesec.1.xml	Thu Jan  1 09:00:00 1970
+++ manpages-3/sharesec.1.xml	Tue Feb 24 16:38:16 2009
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="sharesec.1">
+
+<refmeta>
+	<refentrytitle>sharesec</refentrytitle>
+	<manvolnum>1</manvolnum>
+	<refmiscinfo class="source">Samba</refmiscinfo>
+	<refmiscinfo class="manual">User Commands</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+	<refname>sharesec</refname>
+	<refpurpose>Set or get share ACLs</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<cmdsynopsis>
+		<command>sharesec</command>
+		<arg choice="req">sharename</arg>
+		<arg choice="opt">-r, --remove=ACL</arg>
+		<arg choice="opt">-m, --modify=ACL</arg>
+		<arg choice="opt">-a, --add=ACL</arg>
+		<arg choice="opt">-R, --replace=ACLs</arg>
+		<arg choice="opt">-D, --delete</arg>
+		<arg choice="opt">-v, --view</arg>
+		<arg choice="opt">-M, --machine-sid</arg>
+		<arg choice="opt">-F, --force</arg>
+		<arg choice="opt">-d, --debuglevel=DEBUGLEVEL</arg>
+		<arg choice="opt">-s, --configfile=CONFIGFILE</arg>
+		<arg choice="opt">-l, --log-basename=LOGFILEBASE</arg>
+		<arg choice="opt">-V, --version</arg>
+		<arg choice="opt">-?, --help</arg>
+		<arg choice="opt">--usage</arg>
+	</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+	<title>DESCRIPTION</title>
+
+	<para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
+	<manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+	<para>The <command>sharesec</command> program manipulates share permissions
+	on SMB file shares.</para>
+</refsect1>
+
+
+<refsect1>
+	<title>OPTIONS</title>
+
+	<para>The following options are available to the <command>sharesec</command> program.
+	The format of ACLs is described in the section ACL FORMAT </para>
+
+	<variablelist>
+		<varlistentry>
+		<term>-a|--add=ACL</term>
+		<listitem><para>Add the ACEs specified to the ACL list.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-D|--delete</term>
+		<listitem><para>Delete the entire security descriptor.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-F|--force</term>
+		<listitem><para>Force storing the ACL.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-m|--modify=ACL</term>
+		<listitem><para>Modify existing ACEs.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-M|--machine-sid</term>
+		<listitem><para>Initialize the machine SID.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-r|--remove=ACL</term>
+		<listitem><para>Remove ACEs.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>-R|--replace=ACLS</term>
+		<listitem><para>
+		Overwrite an existing share permission ACL.
+		</para></listitem>
+		</varlistentry>
+
+		&stdarg.help;
+		&stdarg.server.debug;
+		&popt.common.samba;
+	</variablelist>
+</refsect1>
+
+
+<refsect1>
+	<title>ACL FORMAT</title>
+
+	<para>The format of an ACL is one or more ACL entries separated by
+	either commas or newlines.  An ACL entry is one of the following: </para>
+
+	<para><programlisting>
+	REVISION:&lt;revision number&gt;
+	OWNER:&lt;sid or name&gt;
+	GROUP:&lt;sid or name&gt;
+	ACL:&lt;sid or name&gt;:&lt;type&gt;/&lt;flags&gt;/&lt;mask&gt;
+	</programlisting></para>
+
+	<para>The revision of the ACL specifies the internal Windows
+	NT ACL revision for the security descriptor.
+	If not specified it defaults to 1. Using values other than 1 may
+	cause strange behaviour.</para>
+
+	<para>The owner and group specify the owner and group SIDs for the
+	object. If a SID in the format S-1-x-y-z is specified this is used,
+	otherwise the name specified is resolved using the server on which
+	the file or directory resides.</para>
+
+	<para>ACLs specify permissions granted to the SID. This SID
+	can be specified in S-1-x-y-z format or as a name in which case
+	it is resolved against the server on which the file or directory
+	resides.  The type, flags and mask values determine the type of
+	access granted to the SID.</para>
+
+	<para>The type can be either ALLOWED or	DENIED to allow/deny access
+	to the SID. The flags values are generally zero for share ACLs.
+	</para>
+
+	<para>The mask is a value which expresses the access right
+	granted to the SID. It can be given as a decimal or hexadecimal value,
+	or by using one of the following text strings which map to the NT
+	file permissions of the same name.</para>
+
+	<itemizedlist>
+		<listitem><para><emphasis>R</emphasis> - Allow read access </para></listitem>
+		<listitem><para><emphasis>W</emphasis> - Allow write access</para></listitem>
+		<listitem><para><emphasis>X</emphasis> - Execute permission on the object</para></listitem>
+		<listitem><para><emphasis>D</emphasis> - Delete the object</para></listitem>
+		<listitem><para><emphasis>P</emphasis> - Change permissions</para></listitem>
+		<listitem><para><emphasis>O</emphasis> - Take ownership</para></listitem>
+	</itemizedlist>
+
+	<para>The following combined permissions can be specified:</para>
+
+	<itemizedlist>
+		<listitem><para><emphasis>READ</emphasis> -  Equivalent to 'RX'
+		permissions</para></listitem>
+		<listitem><para><emphasis>CHANGE</emphasis> - Equivalent to 'RXWD' permissions
+		</para></listitem>
+		<listitem><para><emphasis>FULL</emphasis> - Equivalent to 'RWXDPO'
+		permissions</para></listitem>
+	</itemizedlist>
+	</refsect1>
+
+<refsect1>
+	<title>EXIT STATUS</title>
+
+	<para>The <command>sharesec</command> program sets the exit status
+	depending on the success or otherwise of the operations performed.
+	The exit status may be one of the following values. </para>
+
+	<para>If the operation succeeded, sharesec returns and exit
+	status of 0.  If <command>sharesec</command> couldn't connect to the specified server,
+	or there was an error getting or setting the ACLs, an exit status
+	of 1 is returned.  If there was an error parsing any command line
+	arguments, an exit status of 2 is returned. </para>
+</refsect1>
+
+<refsect1>
+	<title>EXAMPLES</title>
+
+	<para>Add full access for SID
+	<parameter>S-1-5-21-1866488690-1365729215-3963860297-17724</parameter> on
+	<parameter>share</parameter>:
+	</para>
+
+	<programlisting>
+	host:~ # sharesec share -a S-1-5-21-1866488690-1365729215-3963860297-17724:ALLOWED/0/FULL
+	</programlisting>
+
+	<para>List all ACEs for <parameter>share</parameter>:
+	</para>
+
+	<programlisting>
+	host:~ # sharesec share -v
+	REVISION:1
+	OWNER:(NULL SID)
+	GROUP:(NULL SID)
+	ACL:S-1-1-0:ALLOWED/0/0x101f01ff
+	ACL:S-1-5-21-1866488690-1365729215-3963860297-17724:ALLOWED/0/FULL
+	</programlisting>
+</refsect1>
+
+<refsect1>
+	<title>VERSION</title>
+
+	<para>This man page is correct for version 3 of the Samba suite.</para>
+</refsect1>
+
+<refsect1>
+	<title>AUTHOR</title>
+	<para>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
+	to the way the Linux kernel is developed.</para>
+</refsect1>
+
+</refentry>
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/smb.conf.5.xml manpages-3/smb.conf.5.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/smb.conf.5.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/smb.conf.5.xml	Tue Feb 24 16:38:16 2009
@@ -6,7 +6,7 @@
 	<manvolnum>5</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/smbcacls.1.xml manpages-3/smbcacls.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/smbcacls.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/smbcacls.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/smbclient.1.xml manpages-3/smbclient.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/smbclient.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/smbclient.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/smbcontrol.1.xml manpages-3/smbcontrol.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/smbcontrol.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/smbcontrol.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
@@ -58,23 +58,32 @@
 		on STDIN. An empty command line or a "q" will quit the 
 		program.</para></listitem>
 		</varlistentry>
-		
+
 		<varlistentry>
 		<term>destination</term>
 		<listitem><para>One of <parameter>nmbd</parameter>, <parameter>smbd</parameter> or a process ID.</para>
 
+		<para>The <parameter>all</parameter> destination causes the 
+		message to "broadcast" to all running daemons including nmbd and
+		winbind. This is a change for Samba 3.3, prior to this the
+		paramter smbd used to do this.</para>
+
 		<para>The <parameter>smbd</parameter> destination causes the 
-		message to "broadcast" to all smbd daemons.</para>
+		message to be sent to the smbd daemon specified in the 
+		<filename>smbd.pid</filename> file.</para>
 
 		<para>The <parameter>nmbd</parameter> destination causes the 
 		message to be sent to the nmbd daemon specified in the 
 		<filename>nmbd.pid</filename> file.</para>
 
+		<para>The <parameter>winbindd</parameter> destination causes the 
+		message to be sent to the winbind daemon specified in the 
+		<filename>winbindd.pid</filename> file.</para>
+
 		<para>If a single process ID is given, the message is sent 
 		to only that process.</para></listitem>
 		</varlistentry>
-		
-		
+
 		<varlistentry>
 		<term>message-type</term>
 		<listitem><para>Type of message to send. See 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/smbcquotas.1.xml manpages-3/smbcquotas.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/smbcquotas.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/smbcquotas.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/smbd.8.xml manpages-3/smbd.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/smbd.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/smbd.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/smbget.1.xml manpages-3/smbget.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/smbget.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/smbget.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/smbgetrc.5.xml manpages-3/smbgetrc.5.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/smbgetrc.5.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/smbgetrc.5.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>5</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/smbpasswd.5.xml manpages-3/smbpasswd.5.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/smbpasswd.5.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/smbpasswd.5.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>5</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">File Formats and Conventions</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/smbpasswd.8.xml manpages-3/smbpasswd.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/smbpasswd.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/smbpasswd.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/smbspool.8.xml manpages-3/smbspool.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/smbspool.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/smbspool.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/smbstatus.1.xml manpages-3/smbstatus.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/smbstatus.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/smbstatus.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/smbtar.1.xml manpages-3/smbtar.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/smbtar.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/smbtar.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/smbtree.1.xml manpages-3/smbtree.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/smbtree.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/smbtree.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/swat.8.xml manpages-3/swat.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/swat.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/swat.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/tdbbackup.8.xml manpages-3/tdbbackup.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/tdbbackup.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/tdbbackup.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/tdbdump.8.xml manpages-3/tdbdump.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/tdbdump.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/tdbdump.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/tdbtool.8.xml manpages-3/tdbtool.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/tdbtool.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/tdbtool.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
@@ -188,6 +188,14 @@
 		<option>next</option>
 		</term>
 		<listitem><para>Print the next record in the current database.
+		</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>
+		<option>check</option>
+		</term>
+		<listitem><para>Check the integrity of the current database.
 		</para></listitem>
 		</varlistentry>
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/testparm.1.xml manpages-3/testparm.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/testparm.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/testparm.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/umount.cifs.8.xml manpages-3/umount.cifs.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/umount.cifs.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/umount.cifs.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_acl_tdb.8.xml manpages-3/vfs_acl_tdb.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_acl_tdb.8.xml	Thu Jan  1 09:00:00 1970
+++ manpages-3/vfs_acl_tdb.8.xml	Tue Feb 24 16:38:16 2009
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="vfs_acl_tdb.8">
+
+<refmeta>
+	<refentrytitle>vfs_acl_tdb</refentrytitle>
+	<manvolnum>8</manvolnum>
+	<refmiscinfo class="source">Samba</refmiscinfo>
+	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+	<refname>vfs_acl_tdb</refname>
+	<refpurpose>Save NTFS-ACLs in a tdb file</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<cmdsynopsis>
+		<command>vfs objects = acl_tdb</command>
+	</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+	<title>DESCRIPTION</title>
+
+	<para>This VFS module is part of the
+	<citerefentry><refentrytitle>samba</refentrytitle>
+	<manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+	<para>The <command>vfs_acl_tdb</command> VFS module stores
+	NTFS Access Control Lists (ACLs) in a tdb file.
+	This enables the full mapping of Windows ACLs on Samba
+	servers.
+	</para>
+
+	<para>
+	The ACL settings are stored in
+	<filename>$LOCKDIR/file_ntacls.tdb</filename>.
+	</para>
+
+	<para>Please note that this module is
+	<emphasis>experimental</emphasis>!
+	</para>
+
+	<para>This module is stackable.</para>
+</refsect1>
+
+<refsect1>
+	<title>OPTIONS</title>
+	<para>
+	There are no options for <command>vfs_acl_tdb</command>.
+	</para>
+</refsect1>
+
+<refsect1>
+	<title>AUTHOR</title>
+
+	<para>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
+	to the way the Linux kernel is developed.</para>
+</refsect1>
+
+</refentry>
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_acl_xattr.8.xml manpages-3/vfs_acl_xattr.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_acl_xattr.8.xml	Thu Jan  1 09:00:00 1970
+++ manpages-3/vfs_acl_xattr.8.xml	Tue Feb 24 16:38:16 2009
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="vfs_acl_xattr.8">
+
+<refmeta>
+	<refentrytitle>vfs_acl_xattr</refentrytitle>
+	<manvolnum>8</manvolnum>
+	<refmiscinfo class="source">Samba</refmiscinfo>
+	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+	<refname>vfs_acl_xattr</refname>
+	<refpurpose>Save NTFS-ACLs in Extended Attributes (EAs)</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<cmdsynopsis>
+		<command>vfs objects = acl_xattr</command>
+	</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+	<title>DESCRIPTION</title>
+
+	<para>This VFS module is part of the
+	<citerefentry><refentrytitle>samba</refentrytitle>
+	<manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+	<para>The <command>vfs_acl_xattr</command> VFS module stores
+	NTFS Access Control Lists (ACLs) in Extended Attributes (EAs).
+	This enables the full mapping of Windows ACLs on Samba
+	servers.
+	</para>
+
+	<para>The ACLs are stored in the Extended Attribute
+	<parameter>security.NTACL</parameter> of a file or directory.
+	This Attribute is <emphasis>not</emphasis> listed by
+	<command>getfattr -d <filename>filename</filename></command>.
+	To show the current value, the name of the EA must be specified
+	(e.g. <command>getfattr -n security.NTACL <filename>filename</filename>
+	</command>).
+	</para>
+
+	<para>Please note that this module is
+	<emphasis>experimental</emphasis>!
+	</para>
+
+	<para>This module is stackable.</para>
+</refsect1>
+
+<refsect1>
+	<title>OPTIONS</title>
+	<para>
+	There are no options for <command>vfs_acl_xattr</command>.
+	</para>
+</refsect1>
+
+<refsect1>
+	<title>AUTHOR</title>
+
+	<para>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
+	to the way the Linux kernel is developed.</para>
+</refsect1>
+
+</refentry>
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_audit.8.xml manpages-3/vfs_audit.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_audit.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_audit.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_cacheprime.8.xml manpages-3/vfs_cacheprime.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_cacheprime.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_cacheprime.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_cap.8.xml manpages-3/vfs_cap.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_cap.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_cap.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_catia.8.xml manpages-3/vfs_catia.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_catia.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_catia.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_commit.8.xml manpages-3/vfs_commit.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_commit.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_commit.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_default_quota.8.xml manpages-3/vfs_default_quota.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_default_quota.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_default_quota.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_extd_audit.8.xml manpages-3/vfs_extd_audit.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_extd_audit.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_extd_audit.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_fake_perms.8.xml manpages-3/vfs_fake_perms.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_fake_perms.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_fake_perms.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_fileid.8.xml manpages-3/vfs_fileid.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_fileid.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_fileid.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_full_audit.8.xml manpages-3/vfs_full_audit.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_full_audit.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_full_audit.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_gpfs.8.xml manpages-3/vfs_gpfs.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_gpfs.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_gpfs.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_netatalk.8.xml manpages-3/vfs_netatalk.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_netatalk.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_netatalk.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_notify_fam.8.xml manpages-3/vfs_notify_fam.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_notify_fam.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_notify_fam.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_prealloc.8.xml manpages-3/vfs_prealloc.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_prealloc.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_prealloc.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_readahead.8.xml manpages-3/vfs_readahead.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_readahead.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_readahead.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_readonly.8.xml manpages-3/vfs_readonly.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_readonly.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_readonly.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_recycle.8.xml manpages-3/vfs_recycle.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_recycle.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_recycle.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_shadow_copy.8.xml manpages-3/vfs_shadow_copy.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_shadow_copy.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_shadow_copy.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_shadow_copy2.8.xml manpages-3/vfs_shadow_copy2.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_shadow_copy2.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_shadow_copy2.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml manpages-3/vfs_smb_traffic_analyzer.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_smb_traffic_analyzer.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
@@ -117,6 +117,17 @@
 		</listitem>
 		</varlistentry>
 
+		<varlistentry>
+		<term>smb_traffic_analyzer:total_anonymization = STRING</term>
+		<listitem>
+		<para>If STRING matches to 'yes', the module will replace
+		any user name with the string given by the option 
+		smb_traffic_analyzer:anonymize_prefix, without generating
+		an additional hash number. This means that any transfer data
+		will be mapped to a single user, leading to a total 
+		anonymization of user related data.</para>
+		</listitem>
+		</varlistentry>
 
 	</variablelist>
 </refsect1>
@@ -157,7 +168,7 @@
 
 <refsect1>
 	<title>VERSION</title>
-	<para>This man page is correct for version 3.2.0 of the Samba suite.
+	<para>This man page is correct for version 3.3 of the Samba suite.
 	</para>
 </refsect1>
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_streams_depot.8.xml manpages-3/vfs_streams_depot.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_streams_depot.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_streams_depot.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_streams_xattr.8.xml manpages-3/vfs_streams_xattr.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_streams_xattr.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_streams_xattr.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfs_xattr_tdb.8.xml manpages-3/vfs_xattr_tdb.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfs_xattr_tdb.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfs_xattr_tdb.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/vfstest.1.xml manpages-3/vfstest.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/vfstest.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/vfstest.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/wbinfo.1.xml manpages-3/wbinfo.1.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/wbinfo.1.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/wbinfo.1.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>1</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">User Commands</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
@@ -39,10 +39,14 @@
 		<arg choice="opt">--own-domain</arg>
 		<arg choice="opt">-p</arg>
 		<arg choice="opt">-r user</arg>
+		<arg choice="opt">--remove-uid-mapping uid,sid</arg>
+		<arg choice="opt">--remove-gid-mapping gid,sid</arg>
 		<arg choice="opt">-s sid</arg>
 		<arg choice="opt">--separator</arg>
 		<arg choice="opt">--sequence</arg>
 		<arg choice="opt">--set-auth-user user%password</arg>
+		<arg choice="opt">--set-uid-mapping uid,sid</arg>
+		<arg choice="opt">--set-gid-mapping gid,sid</arg>
 		<arg choice="opt">-S sid</arg>
 		<arg choice="opt">-t</arg>
 		<arg choice="opt">-u</arg>
@@ -328,6 +332,29 @@
 		the operation will fail. </para></listitem>
 		</varlistentry>
 
+		<varlistentry>
+		<term>--remove-uid-mapping uid,sid</term>
+		<listitem><para>Remove an existing uid to sid mapping
+		entry from the IDmap backend.</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>--remove-gid-mapping gid,sid</term>
+		<listitem><para>Remove an existing gid to sid
+		mapping entry from the IDmap backend.</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>--set-uid-mapping uid,sid</term>
+		<listitem><para>Create a new or modify an existing uid to sid
+		mapping in the IDmap backend.</para></listitem>
+		</varlistentry>
+
+		<varlistentry>
+		<term>--set-gid-mapping gid,sid</term>
+		<listitem><para>Create a new or modify an existing gid to sid
+		mapping in the IDmap backend.</para></listitem>
+		</varlistentry>
 
 		&stdarg.version;
 		&stdarg.help;
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/winbind_krb5_locator.7.xml manpages-3/winbind_krb5_locator.7.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/winbind_krb5_locator.7.xml	Thu Jan  1 09:00:00 1970
+++ manpages-3/winbind_krb5_locator.7.xml	Tue Feb 24 16:38:16 2009
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="winbind_krb5_locator.7">
+
+<refmeta>
+	<refentrytitle>winbind_krb5_locator</refentrytitle>
+	<manvolnum>7</manvolnum>
+	<refmiscinfo class="source">Samba</refmiscinfo>
+	<refmiscinfo class="manual">7</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+	<refname>winbind_krb5_locator</refname>
+	<refpurpose>A plugin for MIT and Heimdal Kerberos for detecting KDCs using Windows semantics.</refpurpose>
+</refnamediv>
+
+
+<refsect1>
+	<title>DESCRIPTION</title>
+
+	<para>
+	This plugin is part of the <citerefentry><refentrytitle>samba</refentrytitle>
+	<manvolnum>7</manvolnum></citerefentry> suite.
+	</para>
+
+	<para>
+		<command>winbind_krb5_locator</command> is a plugin that permits MIT and
+		Heimdal Kerberos libraries to detect Kerberos Servers (for the KDC and
+		kpasswd service) using the same semantics that other tools of the Samba
+		suite use. This include site-aware DNS service record lookups and caching
+		of closest dc.
+		The plugin uses the public locator API provided by most modern Kerberos
+		implementations.
+	</para>
+</refsect1>
+<refsect1>
+	<title>PREREQUISITES</title>
+	<para>
+		MIT Kerberos (at least version 1.5) or Heimdal Kerberos (at least version
+		1.0) is required.
+	</para>
+
+	<para>
+		The plugin queries the <citerefentry><refentrytitle>winbindd</refentrytitle>
+		<manvolnum>8</manvolnum></citerefentry> daemon which needs to be configured
+		and started separately.
+	</para>
+
+	<para>
+		The <command>winbind_krb5_locator.so</command> file needs to be manually
+		copied to the plugin directory of the system Kerberos library.
+
+		For MIT Kerberos this is often:
+			<filename>/usr/lib/krb5/plugins/libkrb5/</filename>.
+		For Heimdal Kerberos this is often:
+			<filename>/usr/lib/plugin/krb5/</filename>.
+
+		Please check your local Kerberos installation for the correct
+		paths. No modification in <filename>/etc/krb5.conf</filename>
+		is required to enable the use of this plugin.
+	</para>
+	<para>
+		After copying the locator plugin to the appropriate plugin
+		directory it should immediately be available for use.
+		Users should be able to kinit into their kerberized Windows
+		environment without any modification or servers
+		being put manually into <filename>/etc/krb5.conf</filename>.
+	</para>
+</refsect1>
+
+<refsect1>
+	<title>VERSION</title>
+
+	<para>
+	This man page is correct for version 3 of the Samba suite.
+	</para>
+</refsect1>
+
+<refsect1>
+	<title>AUTHOR</title>
+
+	<para>
+		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 to the way the Linux kernel is developed.
+	</para>
+
+	<para>
+		The winbind_krb5_locator manpage was written by Guenther Deschner.
+	</para>
+</refsect1>
+
+</refentry>
diff -urN ../../samba-3.2.8/docs-xml/manpages-3/winbindd.8.xml manpages-3/winbindd.8.xml
--- ../../samba-3.2.8/docs-xml/manpages-3/winbindd.8.xml	Wed Feb  4 01:10:07 2009
+++ manpages-3/winbindd.8.xml	Tue Feb 24 16:38:16 2009
@@ -7,7 +7,7 @@
 	<manvolnum>8</manvolnum>
 	<refmiscinfo class="source">Samba</refmiscinfo>
 	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
-	<refmiscinfo class="version">3.2</refmiscinfo>
+	<refmiscinfo class="version">3.3</refmiscinfo>
 </refmeta>
 
 
@@ -230,9 +230,6 @@
 	determine which user and group ids correspond to Windows NT user
 	and group rids. </para>
 
-        <para>See the <smbconfoption name="idmap domains"/> or the old <smbconfoption name="idmap backend"/> parameters in
-        <filename>smb.conf</filename> for options for sharing this
-        database, such as via LDAP.</para>
 </refsect1>