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, 9 insertions, 7 deletions

diff --git a/docs/htmldocs/manpages/winbindd.8.html b/docs/htmldocs/manpages/winbindd.8.html
index b04ecab0a7..87d67bb47d 100644
--- a/docs/htmldocs/manpages/winbindd.8.html
+++ b/docs/htmldocs/manpages/winbindd.8.html
@@ -127,7 +127,9 @@ log.smbd, etc...). The log file is never removed by the client.
 	where the user and group mappings are stored by winbindd.  If this
 	store is deleted or corrupted, there is no way for winbindd to
 	determine which user and group ids correspond to Windows NT user
-	and group rids. </p></div><div class="refsect1" lang="en"><a name="id2478640"></a><h2>CONFIGURATION</h2><p>Configuration of the <code class="literal">winbindd</code> daemon
+	and group rids. </p><p>See the <a class="link" href="smb.conf.5.html#IDMAPDOMAINS">idmap domains</a> or the old <a class="link" href="smb.conf.5.html#IDMAPBACKEND">idmap backend</a> parameters in
+        <code class="filename">smb.conf</code> for options for sharing this
+        database, such as via LDAP.</p></div><div class="refsect1" lang="en"><a name="id2478675"></a><h2>CONFIGURATION</h2><p>Configuration of the <code class="literal">winbindd</code> daemon
 	is done through configuration parameters in the <a class="citerefentry" href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a> file.  All parameters should be specified in the
 	[global] section of smb.conf. </p><div class="itemizedlist"><ul type="disc"><li><p>
 		<a class="link" href="smb.conf.5.html#WINBINDSEPARATOR">winbind separator</a></p></li><li><p>
@@ -144,7 +146,7 @@ log.smbd, etc...). The log file is never removed by the client.
 		Setting this parameter forces winbindd to use RPC
 		instead of LDAP to retrieve information from Domain
 		Controllers.
-		</p></li></ul></div></div><div class="refsect1" lang="en"><a name="id2525503"></a><h2>EXAMPLE SETUP</h2><p>
+		</p></li></ul></div></div><div class="refsect1" lang="en"><a name="id2525538"></a><h2>EXAMPLE SETUP</h2><p>
 	To setup winbindd for user and group lookups plus
 	authentication from a domain controller use something like the
 	following setup. This was tested on an early Red Hat Linux box.
@@ -195,7 +197,7 @@ auth  required    /lib/security/pam_unix.so \
 	and that you can login to your unix box as a domain user, using
 	the DOMAIN+user syntax for the username. You may wish to use the
 	commands <code class="literal">getent passwd</code> and <code class="literal">getent group
-	</code> to confirm the correct operation of winbindd.</p></div><div class="refsect1" lang="en"><a name="id2525711"></a><h2>NOTES</h2><p>The following notes are useful when configuring and
+	</code> to confirm the correct operation of winbindd.</p></div><div class="refsect1" lang="en"><a name="id2525746"></a><h2>NOTES</h2><p>The following notes are useful when configuring and
 	running <code class="literal">winbindd</code>: </p><p><a class="citerefentry" href="nmbd.8.html"><span class="citerefentry"><span class="refentrytitle">nmbd</span>(8)</span></a> must be running on the local machine
 	for <code class="literal">winbindd</code> to work. </p><p>PAM is really easy to misconfigure.  Make sure you know what
 	you are doing when modifying PAM configuration files.  It is possible
@@ -203,7 +205,7 @@ auth  required    /lib/security/pam_unix.so \
 	then in general the user and groups ids allocated by winbindd will not
 	be the same.  The user and group ids will only be valid for the local
 	machine, unless a shared <a class="link" href="smb.conf.5.html#IDMAPBACKEND">idmap backend</a> is configured.</p><p>If the the Windows NT SID to UNIX user and group id mapping
-	file is damaged or destroyed then the mappings will be lost. </p></div><div class="refsect1" lang="en"><a name="id2525783"></a><h2>SIGNALS</h2><p>The following signals can be used to manipulate the
+	file is damaged or destroyed then the mappings will be lost. </p></div><div class="refsect1" lang="en"><a name="id2525817"></a><h2>SIGNALS</h2><p>The following signals can be used to manipulate the
 	<code class="literal">winbindd</code> daemon. </p><div class="variablelist"><dl><dt><span class="term">SIGHUP</span></dt><dd><p>Reload the <a class="citerefentry" href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a> file and
 		apply any parameter changes to the running
 		version of winbindd.  This signal also clears any cached
@@ -211,7 +213,7 @@ auth  required    /lib/security/pam_unix.so \
 		by winbindd is also reloaded.  </p></dd><dt><span class="term">SIGUSR2</span></dt><dd><p>The SIGUSR2 signal will cause <code class="literal">
 		winbindd</code> to write status information to the winbind
 		log file.</p><p>Log files are stored in the filename specified by the
-		log file parameter.</p></dd></dl></div></div><div class="refsect1" lang="en"><a name="id2525848"></a><h2>FILES</h2><div class="variablelist"><dl><dt><span class="term"><code class="filename">/etc/nsswitch.conf(5)</code></span></dt><dd><p>Name service switch configuration file.</p></dd><dt><span class="term">/tmp/.winbindd/pipe</span></dt><dd><p>The UNIX pipe over which clients communicate with
+		log file parameter.</p></dd></dl></div></div><div class="refsect1" lang="en"><a name="id2525882"></a><h2>FILES</h2><div class="variablelist"><dl><dt><span class="term"><code class="filename">/etc/nsswitch.conf(5)</code></span></dt><dd><p>Name service switch configuration file.</p></dd><dt><span class="term">/tmp/.winbindd/pipe</span></dt><dd><p>The UNIX pipe over which clients communicate with
 		the <code class="literal">winbindd</code> program.  For security reasons, the
 		winbind client will only attempt to connect to the winbindd daemon
 		if both the <code class="filename">/tmp/.winbindd</code> directory
@@ -232,8 +234,8 @@ auth  required    /lib/security/pam_unix.so \
 		compiled using the <em class="parameter"><code>--with-lockdir</code></em> option.
 		This directory is by default <code class="filename">/usr/local/samba/var/locks
 		</code>. </p></dd><dt><span class="term">$LOCKDIR/winbindd_cache.tdb</span></dt><dd><p>Storage for cached user and group information.
-		</p></dd></dl></div></div><div class="refsect1" lang="en"><a name="id2526004"></a><h2>VERSION</h2><p>This man page is correct for version 3 of
-        the Samba suite.</p></div><div class="refsect1" lang="en"><a name="id2526015"></a><h2>SEE ALSO</h2><p><code class="filename">nsswitch.conf(5)</code>, <a class="citerefentry" href="samba.7.html"><span class="citerefentry"><span class="refentrytitle">samba</span>(7)</span></a>, <a class="citerefentry" href="wbinfo.1.html"><span class="citerefentry"><span class="refentrytitle">wbinfo</span>(1)</span></a>, <a class="citerefentry" href="ntlm_auth.8.html"><span class="citerefentry"><span class="refentrytitle">ntlm_auth</span>(8)</span></a>, <a class="citerefentry" href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a>, <a class="citerefentry" href="pam_winbind.8.html"><span class="citerefentry"><span class="refentrytitle">pam_winbind</span>(8)</span></a></p></div><div class="refsect1" lang="en"><a name="id2526072"></a><h2>AUTHOR</h2><p>The original Samba software and related utilities
+		</p></dd></dl></div></div><div class="refsect1" lang="en"><a name="id2526038"></a><h2>VERSION</h2><p>This man page is correct for version 3 of
+        the Samba suite.</p></div><div class="refsect1" lang="en"><a name="id2526049"></a><h2>SEE ALSO</h2><p><code class="filename">nsswitch.conf(5)</code>, <a class="citerefentry" href="samba.7.html"><span class="citerefentry"><span class="refentrytitle">samba</span>(7)</span></a>, <a class="citerefentry" href="wbinfo.1.html"><span class="citerefentry"><span class="refentrytitle">wbinfo</span>(1)</span></a>, <a class="citerefentry" href="ntlm_auth.8.html"><span class="citerefentry"><span class="refentrytitle">ntlm_auth</span>(8)</span></a>, <a class="citerefentry" href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a>, <a class="citerefentry" href="pam_winbind.8.html"><span class="citerefentry"><span class="refentrytitle">pam_winbind</span>(8)</span></a></p></div><div class="refsect1" lang="en"><a name="id2526106"></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
 	to the way the Linux kernel is developed.</p><p><code class="literal">wbinfo</code> and <code class="literal">winbindd</code> were