From 430aff35bb27e603060d585e156d8d9f5d7490fd Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Thu, 15 Dec 2005 11:39:46 +0000 Subject: [PATCH] assume operations with version set to 0 are internal, and use LDAPv3 --- servers/slapd/back-ldap/bind.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c index b9be36a408..0531d46f59 100644 --- a/servers/slapd/back-ldap/bind.c +++ b/servers/slapd/back-ldap/bind.c @@ -336,7 +336,7 @@ retry:; rc = ldap_install_tls( ld ); } else if ( rc == LDAP_REFERRAL ) { - rc = LDAP_OTHER; + rc = LDAP_UNWILLING_TO_PERFORM; *text = "unwilling to chase referral returned by Start TLS exop"; } @@ -415,6 +415,10 @@ ldap_back_prepare_conn( ldapconn_t **lcp, Operation *op, SlapReply *rs, ldap_bac /* Set LDAP version. This will always succeed: If the client * bound with a particular version, then so can we. */ + if ( vers == 0 ) { + /* assume it's an internal op; set to LDAPv3 */ + vers = LDAP_VERSION3; + } ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, (const void *)&vers ); /* automatically chase referrals ("[dont-]chase-referrals" statement) */ -- 2.39.5