mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add disallow and requires to man page. Fix sasl ssf handling bug.

Browse Source
This commit is contained in:
Kurt Zeilenga 2000-08-28 18:58:13 +00:00
parent bf3df2f7a6
commit 9715e7f008
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
doc/man/man5/slapd.conf.5
View File

@ -125,6 +125,18 @@ recommended that
directives be used instead.
.RE
.TP
.B disallow <features>
Specify a set of features (separated by white space) to disallow.
.B bind_v2
disables acceptance of LDAPv2 bind requests.
.B bind_anon
disables acceptance of anonymous bind requests.
.B bind_anon_cred
disables anonymous bind creditials are not empty (e.g. when
DN is empty).
.B bind_anon_dn
disables anonymous bind when DN is not empty.
.TP
.B idletimeout <integer>
Specify the number of seconds to wait before forcibly closing
an idle client connections. A idletimeout of 0 disables this
@ -229,6 +241,28 @@ Specify the referral to pass back when
cannot find a local database to handle a request.
If specified multiple times, each url is provided.
.TP
.B require <conditions>
Specify a set of conditions (separated by white space) to require.
The directive may be specified globally and/or per-database.
.B bind
requires bind operation prior to directory operations.
.B LDAPv3
requires session to be using LDAP version 3.
.B authc
requires authentication prior to directory operations.
.B SASL
requires SASL authentication prior to directory operations.
.B strong
requires strong authentication prior to directory operations.
Currently
.B SASL
and
.B strong
conditions are currently same.
.B none
may be used to require no conditions (useful for clearly globally
set conditions within a particular database).
.TP
.B sasl-realm <string>
Used to specify Cyrus SASL realm.
.TP

2
servers/slapd/backend.c
View File

@ -733,7 +733,7 @@ backend_check_restrictions(
if( op->o_authmech == NULL ||
op->o_dn == NULL || *op->o_dn == '\0' )
{
*text = "SASL authentication required";
*text = "strong authentication required";
return LDAP_STRONG_AUTH_REQUIRED;
}
}

4
servers/slapd/bind.c
View File

@ -251,6 +251,10 @@ do_bind(
conn->c_dn = edn;
conn->c_authmech = mech;
if( ssf ) conn->c_sasl_layers++;
conn->c_sasl_ssf = ssf;
if( ssf > conn->c_ssf ) {
conn->c_ssf = ssf;
}
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
} else if ( rc == LDAP_SASL_BIND_IN_PROGRESS ) {