Skip to content
Snippets Groups Projects
Commit e0e7e984 authored by Mark Valence's avatar Mark Valence
Browse files

client/server controls added to ldap_start_tls().

parent 01ab716e
No related branches found
No related tags found
No related merge requests found
...@@ -995,7 +995,9 @@ ldap_initialize LDAP_P(( ...@@ -995,7 +995,9 @@ ldap_initialize LDAP_P((
LIBLDAP_F( int ) LIBLDAP_F( int )
ldap_start_tls LDAP_P(( ldap_start_tls LDAP_P((
LDAP *ld )); LDAP *ld,
LDAPControl **serverctrls,
LDAPControl **clientctrls ));
/* /*
* in messages.c: * in messages.c:
......
...@@ -228,7 +228,9 @@ ldap_initialize( LDAP **ldp, LDAP_CONST char *url ) ...@@ -228,7 +228,9 @@ ldap_initialize( LDAP **ldp, LDAP_CONST char *url )
} }
int int
ldap_start_tls ( LDAP *ld ) ldap_start_tls ( LDAP *ld,
LDAPControl **serverctrls,
LDAPControl **clientctrls )
{ {
#ifdef HAVE_TLS #ifdef HAVE_TLS
LDAPConn *lc; LDAPConn *lc;
...@@ -246,7 +248,7 @@ ldap_start_tls ( LDAP *ld ) ...@@ -246,7 +248,7 @@ ldap_start_tls ( LDAP *ld )
if (ldap_pvt_tls_inplace(lc->lconn_sb) != 0) if (ldap_pvt_tls_inplace(lc->lconn_sb) != 0)
return LDAP_OPERATIONS_ERROR; return LDAP_OPERATIONS_ERROR;
rc = ldap_extended_operation_s(ld, LDAP_EXOP_START_TLS, rc = ldap_extended_operation_s(ld, LDAP_EXOP_START_TLS,
NULL, NULL, NULL, &rspoid, &rspdata); NULL, serverctrls, clientctrls, &rspoid, &rspdata);
if (rc != LDAP_SUCCESS) if (rc != LDAP_SUCCESS)
return rc; return rc;
rc = ldap_pvt_tls_start( lc->lconn_sb, ld->ld_options.ldo_tls_ctx ); rc = ldap_pvt_tls_start( lc->lconn_sb, ld->ld_options.ldo_tls_ctx );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment