From: Mark Valence <mrv@openldap.org>
Date: Fri, 10 Dec 1999 18:26:12 +0000 (+0000)
Subject: client/server controls added to ldap_start_tls().
X-Git-Tag: UCDATA_2_4~102
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e0e7e9842eee6ccd0ec1829c8fe0b8079b3185f7;p=openldap

client/server controls added to ldap_start_tls().
---

diff --git a/include/ldap.h b/include/ldap.h
index 072c0a5809..e9352f9dbc 100644
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -995,7 +995,9 @@ ldap_initialize LDAP_P((
 
 LIBLDAP_F( int )
 ldap_start_tls LDAP_P((
-	LDAP *ld ));
+	LDAP *ld,
+	LDAPControl **serverctrls,
+	LDAPControl **clientctrls ));
 
 /*
  * in messages.c:
diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 99525b1bd6..7ff7d5a740 100644
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -228,7 +228,9 @@ ldap_initialize( LDAP **ldp, LDAP_CONST char *url )
 }
 
 int
-ldap_start_tls ( LDAP *ld )
+ldap_start_tls ( LDAP *ld,
+				LDAPControl **serverctrls,
+				LDAPControl **clientctrls )
 {
 #ifdef HAVE_TLS
 	LDAPConn *lc;
@@ -246,7 +248,7 @@ ldap_start_tls ( LDAP *ld )
 		if (ldap_pvt_tls_inplace(lc->lconn_sb) != 0)
 			return LDAP_OPERATIONS_ERROR;
 		rc = ldap_extended_operation_s(ld, LDAP_EXOP_START_TLS,
-							NULL, NULL, NULL, &rspoid, &rspdata);
+							NULL, serverctrls, clientctrls, &rspoid, &rspdata);
 		if (rc != LDAP_SUCCESS)
 			return rc;
 		rc = ldap_pvt_tls_start( lc->lconn_sb, ld->ld_options.ldo_tls_ctx );