diff options
| author | Gerald Carter <jerry@samba.org> | 2002-01-05 03:52:39 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-01-05 03:52:39 +0000 |
| commit | 7d3cc61d26a7787c73397f940796c9aae93da096 (patch) | |
| tree | d251be0ff2ba7d3a7b44cfc981515747197bb463 /docs/docbook/manpages/smb.conf.5.sgml | |
| parent | 69d6c9fe1af2d85036cfbebbf3788128c6d7c5ff (diff) | |
| download | samba-7d3cc61d26a7787c73397f940796c9aae93da096.tar.gz samba-7d3cc61d26a7787c73397f940796c9aae93da096.tar.bz2 samba-7d3cc61d26a7787c73397f940796c9aae93da096.zip | |
merge from 2.2 and regenerate docs
(This used to be commit f7d900873c3553dde88d42d903b74dc49c9a6c71)
Diffstat (limited to 'docs/docbook/manpages/smb.conf.5.sgml')
| -rw-r--r-- | docs/docbook/manpages/smb.conf.5.sgml | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml index a7328e7cf6..9e719e1f2a 100644 --- a/docs/docbook/manpages/smb.conf.5.sgml +++ b/docs/docbook/manpages/smb.conf.5.sgml @@ -2493,7 +2493,7 @@ causes <command>smbd</command> to authenticate against another server.</para> - <para>Default: <command>encrypt passwords = no</command></para></listitem> + <para>Default: <command>encrypt passwords = yes</command></para></listitem> </varlistentry> @@ -3451,10 +3451,13 @@ <para> This option is used to control the tcp port number used to contact the <link linkend="LDAPSERVER"><parameter>ldap server</parameter></link>. - The default is to use the stand LDAP port 389. + The default is to use the stand LDAPS port 636. </para> - <para>Default : <command>ldap port = 389</command></para> + <para>See Also: <link linkend="LDAPSSL">ldap ssl</link> + </para> + + <para>Default : <command>ldap port = 636</command></para> </listitem> </varlistentry> @@ -3502,15 +3505,15 @@ <para> The <parameter>ldap ssl</parameter> can be set to one of three values: - (a) <command>on</command> - Always use SSL when contacting the - <parameter>ldap server</parameter>, (b) <command>off</command> - - Never use SSL when querying the directory, or (c) <command>start - tls</command> - Use the LDAPv3 StartTLS extended operation + (a) <constant>on</constant> - Always use SSL when contacting the + <parameter>ldap server</parameter>, (b) <constant>off</constant> - + Never use SSL when querying the directory, or (c) <constant>start_tls</constant> + - Use the LDAPv3 StartTLS extended operation (RFC2830) for communicating with the directory server. </para> - <para>Default : <command>ldap ssl = off</command></para> + <para>Default : <command>ldap ssl = on</command></para> </listitem> </varlistentry> |