upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 07:39:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add ldap_start_tls() and ldap_install_tls() to provide async version

Browse source 
of ldap_start_tls_s().
This commit is contained in:
Kurt Zeilenga 2005-02-01 23:53:17 +00:00
parent 1510265454
commit 542f3634aa
2 changed files with 43 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/ldap.h
View file

@ -1304,6 +1304,21 @@ ldap_initialize LDAP_P((
LDAP **ldp, LDAP **ldp,
LDAP_CONST char *url )); LDAP_CONST char *url ));
/*
* in tls.c
*/
LDAP_F( int )
ldap_start_tls LDAP_P((
LDAP *ld,
LDAPControl **serverctrls,
LDAPControl **clientctrls,
int *msgidp ));
LDAP_F( int )
ldap_install_tls LDAP_P((
LDAP *ld ));
LDAP_F( int ) LDAP_F( int )
ldap_start_tls_s LDAP_P(( ldap_start_tls_s LDAP_P((
LDAP *ld, LDAP *ld,

33
libraries/libldap/tls.c
View file

@ -1651,14 +1651,39 @@ ldap_pvt_tls_get_my_dn( void *s, struct berval *dn, LDAPDN_rewrite_dummy *func,
#endif #endif
} }
int
ldap_start_tls( LDAP *ld,
LDAPControl **serverctrls,
LDAPControl **clientctrls,
int *msgidp )
{
return ldap_extended_operation( ld, LDAP_EXOP_START_TLS,
NULL, serverctrls, clientctrls, msgidp );
}
int
ldap_install_tls( LDAP *ld )
{
#ifndef HAVE_TLS
return LDAP_NOT_SUPPORTED;
#else
if ( ld->ld_sb != NULL && ldap_pvt_tls_inplace( ld->ld_sb ) != 0 ) {
return LDAP_LOCAL_ERROR;
}
return ldap_int_tls_start( ld, ld->ld_defconn, NULL );
#endif
}
int int
ldap_start_tls_s ( LDAP *ld, ldap_start_tls_s ( LDAP *ld,
LDAPControl **serverctrls, LDAPControl **serverctrls,
LDAPControl **clientctrls ) LDAPControl **clientctrls )
{ {
#ifndef HAVE_TLS
return LDAP_NOT_SUPPORTED;
#else
int rc; int rc;
#ifdef HAVE_TLS
char *rspoid = NULL; char *rspoid = NULL;
struct berval *rspdata = NULL; struct berval *rspdata = NULL;
@ -1683,9 +1708,7 @@ ldap_start_tls_s ( LDAP *ld,
rc = ldap_int_tls_start( ld, ld->ld_defconn, NULL ); rc = ldap_int_tls_start( ld, ld->ld_defconn, NULL );
} }
#else
rc = LDAP_NOT_SUPPORTED;
#endif
return rc; return rc;
#endif
} }