summaryrefslogtreecommitdiff
path: root/docs/docbook
diff options
context:
space:
mode:
authorJohn Terpstra <jht@samba.org>2003-05-25 08:12:43 +0000
committerJohn Terpstra <jht@samba.org>2003-05-25 08:12:43 +0000
commit6ab9279d19d5ca8ecb165c2d45dd06727586921f (patch)
tree7c872fc623d4b5d49fd197678e9ed152eff54bbf /docs/docbook
parent068a7de4d68184e98a6268dc210938276e60e7fc (diff)
downloadsamba-6ab9279d19d5ca8ecb165c2d45dd06727586921f.tar.gz
samba-6ab9279d19d5ca8ecb165c2d45dd06727586921f.tar.bz2
samba-6ab9279d19d5ca8ecb165c2d45dd06727586921f.zip
Merge from HEAD.
(This used to be commit 0c6525408309fe905abcd82e54b8a6ed0de0ed69)
Diffstat (limited to 'docs/docbook')
-rw-r--r--docs/docbook/projdoc/Speed.xml10
-rw-r--r--docs/docbook/projdoc/StandAloneServer.xml4
-rw-r--r--docs/docbook/projdoc/passdb.xml2
3 files changed, 13 insertions, 3 deletions
diff --git a/docs/docbook/projdoc/Speed.xml b/docs/docbook/projdoc/Speed.xml
index 2509883916..03ce51d1c5 100644
--- a/docs/docbook/projdoc/Speed.xml
+++ b/docs/docbook/projdoc/Speed.xml
@@ -197,6 +197,16 @@ the lowest practical <command>password level</command> will improve things.
</sect1>
+<title>LDAP</title>
+
+<para>
+LDAP can be vastly improved by using the
+<ulink url="smb.conf.5.html#LDAPTRUSTIDS">ldap trust ids</ulink> parameter.
+</para>
+
+</sect1>
+
+
<sect1>
<title>Client tuning</title>
diff --git a/docs/docbook/projdoc/StandAloneServer.xml b/docs/docbook/projdoc/StandAloneServer.xml
index 77d3174488..d8f5992191 100644
--- a/docs/docbook/projdoc/StandAloneServer.xml
+++ b/docs/docbook/projdoc/StandAloneServer.xml
@@ -70,8 +70,8 @@ the samba server is NOT a member of a domain security context.
<para>
Through the use of PAM (Pluggable Authentication Modules) and nsswitch
(the name service switcher) the source of authentication may reside on
-another server. We call this the authentication server. This means that
-the samba server may use the local Unix/Linux system password database
+another server. We would be inclined to call this the authentication server.
+This means that the samba server may use the local Unix/Linux system password database
(/etc/passwd or /etc/shadow), may use a local smbpasswd file, or may use
an LDAP back end, or even via PAM and Winbind another CIFS/SMB server
for authentication.
diff --git a/docs/docbook/projdoc/passdb.xml b/docs/docbook/projdoc/passdb.xml
index c64f568571..ba0d846ddc 100644
--- a/docs/docbook/projdoc/passdb.xml
+++ b/docs/docbook/projdoc/passdb.xml
@@ -834,7 +834,7 @@ index default sub
<para>
<programlisting>
-root# </prompt><userinput>/etc/init.d/slapd restart</userinput>
+<prompt>root# </prompt><userinput>/etc/init.d/slapd restart</userinput>
</programlisting>
</para>