From a64932dfc06af46d4a4eebd6fb537e229466b00b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 17 May 2002 11:10:34 +0000 Subject: Update the doco for the LDAP options in smb.conf, in line with code changes a little while back. We might have to look at the migration path for these options. (or as --with-ldap has always been 'experimental' we could ignore it...) Andrew Bartlett (This used to be commit 35e909b33870f6c5d8af9398d6f9f816e83e2ca4) --- docs/docbook/manpages/smb.conf.5.sgml | 72 ++++++++++++++--------------------- 1 file changed, 29 insertions(+), 43 deletions(-) (limited to 'docs/docbook/manpages') diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml index e8846e4b26..ba4495e34f 100644 --- a/docs/docbook/manpages/smb.conf.5.sgml +++ b/docs/docbook/manpages/smb.conf.5.sgml @@ -644,10 +644,10 @@ ldap admin dn ldap filter - ldap port - ldap server ldap ssl ldap suffix + ldap suffix + ldap suffix lm announce lm interval @@ -3375,10 +3375,8 @@ - - - ldap port (G) + ldap ssl (G) This parameter is only available if Samba has been configure to include the --with-ldapsam option at compile time. This option should be considered experimental and @@ -3386,15 +3384,25 @@ - This option is used to control the tcp port number used to contact - the ldap server. - The default is to use the stand LDAPS port 636. + This option is used to define whether or not Samba should + use SSL when connecting to the ldap + server. This is NOT related to + Samba SSL support which is enabled by specifying the + --with-ssl option to the configure + script (see ssl). - - See Also: ldap ssl + + + The ldap ssl can be set to one of three values: + (a) on - Always use SSL when contacting the + ldap server, (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 : ldap port = 636 + + Default : ldap ssl = on @@ -3402,67 +3410,45 @@ - ldap server (G) + ldap suffix (G) This parameter is only available if Samba has been configure to include the --with-ldapsam option at compile time. This option should be considered experimental and under active development. - - This parameter should contains the FQDN of the ldap directory - server which should be queried to locate user account information. - - - Default : ldap server = localhost + Default : none - - ldap ssl (G) + ldap user suffix (G) This parameter is only available if Samba has been configure to include the --with-ldapsam option at compile time. This option should be considered experimental and - under active development. - - - - This option is used to define whether or not Samba should - use SSL when connecting to the ldap - server. This is NOT related to - Samba SSL support which is enabled by specifying the - --with-ssl option to the configure - script (see ssl). - - - - The ldap ssl can be set to one of three values: - (a) on - Always use SSL when contacting the - ldap server, (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. + under active development. It specified where users are added to the + tree. + - Default : ldap ssl = on + Default : none - - ldap suffix (G) + ldap machine suffix (G) This parameter is only available if Samba has been configure to include the --with-ldapsam option at compile time. This option should be considered experimental and - under active development. + under active development. It specifies where machines should be + added to the ldap tree. -- cgit