1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-10 12:58:35 +03:00

Merge from HEAD.

(This used to be commit 0c6525408309fe905abcd82e54b8a6ed0de0ed69)
This commit is contained in:
John Terpstra 2003-05-25 08:12:43 +00:00
parent 068a7de4d6
commit 6ab9279d19
3 changed files with 13 additions and 3 deletions

View File

@ -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>

View File

@ -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.

View File

@ -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>