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/manpages/smb.conf.5 | |
| 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/manpages/smb.conf.5')
| -rw-r--r-- | docs/manpages/smb.conf.5 | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5 index 9d88615f3f..92ad1158f5 100644 --- a/docs/manpages/smb.conf.5 +++ b/docs/manpages/smb.conf.5 @@ -3,7 +3,7 @@ .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> .\" Please send any bug reports, improvements, comments, patches, .\" etc. to Steve Cheng <steve@ggi-project.org>. -.TH "SMB.CONF" "5" "06 December 2001" "" "" +.TH "SMB.CONF" "5" "04 January 2002" "" "" .SH NAME smb.conf \- The configuration file for the Samba suite .SH "SYNOPSIS" @@ -2682,7 +2682,7 @@ and maintain this file), or set the security = [server|domain] parameter which causes \fBsmbd\fR to authenticate against another server. -Default: \fBencrypt passwords = no\fR +Default: \fBencrypt passwords = yes\fR .TP \fBenhanced browsing (G)\fR This option enables a couple of enhancements to @@ -3428,9 +3428,11 @@ under active development. This option is used to control the tcp port number used to contact the \fIldap server\fR. -The default is to use the stand LDAP port 389. +The default is to use the stand LDAPS port 636. -Default : \fBldap port = 389\fR +See Also: ldap ssl + +Default : \fBldap port = 636\fR .TP \fBldap server (G)\fR This parameter is only available if Samba has been @@ -3457,13 +3459,13 @@ Samba SSL support which is enabled by specifying the script (see \fIssl\fR). The \fIldap ssl\fR can be set to one of three values: -(a) \fBon\fR - Always use SSL when contacting the -\fIldap server\fR, (b) \fBoff\fR - -Never use SSL when querying the directory, or (c) \fBstart -tls\fR - Use the LDAPv3 StartTLS extended operation +(a) on - Always use SSL when contacting the +\fIldap server\fR, (b) off - +Never use SSL when querying the directory, or (c) start_tls +- Use the LDAPv3 StartTLS extended operation (RFC2830) for communicating with the directory server. -Default : \fBldap ssl = off\fR +Default : \fBldap ssl = on\fR .TP \fBldap suffix (G)\fR This parameter is only available if Samba has been |