summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn H Terpstra <jht@samba.org>2008-05-19 13:00:01 -0500
committerKarolin Seeger <kseeger@samba.org>2008-06-23 10:45:41 +0200
commit551b737f9bed8ecc764290d007fcba74109a6c24 (patch)
treea03436904c238b2bf43eb7995828067cbbd6e3d8
parent993d80fd22b7c0a6e2eec5ab899f51e077c529cb (diff)
downloadsamba-551b737f9bed8ecc764290d007fcba74109a6c24.tar.gz
samba-551b737f9bed8ecc764290d007fcba74109a6c24.tar.bz2
samba-551b737f9bed8ecc764290d007fcba74109a6c24.zip
Clarification that hosts resolution is done by winbind only on IRIX, all other systems use libnss_wins.so.
(cherry picked from commit 2a953d6ba252e5ba4e28b7fae5979e7c47fe9bd0) (cherry picked from commit 59bb2b0c9a6397bb0202055d7b00dce30d7bf03b) (This used to be commit 5144c1b2d6891ecf5d21a0b3982276bdbcf27960)
-rw-r--r--docs-xml/manpages-3/winbindd.8.xml15
1 files changed, 10 insertions, 5 deletions
diff --git a/docs-xml/manpages-3/winbindd.8.xml b/docs-xml/manpages-3/winbindd.8.xml
index 8e981fd102..5bc1255d25 100644
--- a/docs-xml/manpages-3/winbindd.8.xml
+++ b/docs-xml/manpages-3/winbindd.8.xml
@@ -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.0</refmiscinfo>
</refmeta>
@@ -119,12 +119,17 @@
resolve user and group information from <filename>/etc/passwd
</filename> and <filename>/etc/group</filename> and then from the
Windows NT server.
+ </para>
+
<programlisting>
passwd: files winbind
group: files winbind
-## only available on IRIX; Linux users should us libnss_wins.so
-hosts: files dns winbind
-</programlisting></para>
+## only available on IRIX: use winbind to resolve hosts:
+# hosts: files dns winbind
+## All other NSS enabled systems should use libnss_wins.so like this:
+hosts: files dns wins
+
+</programlisting>
<para>The following simple configuration in the
<filename>/etc/nsswitch.conf</filename> file can be used to initially
@@ -470,7 +475,7 @@ auth required /lib/security/pam_unix.so \
<refsect1>
<title>VERSION</title>
- <para>This man page is correct for version 3 of
+ <para>This man page is correct for version 3.0 of
the Samba suite.</para>
</refsect1>