upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-03 21:50:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#5928 hide all ldap_pvt_tls APIs when !HAVE_TLS

Browse source
This commit is contained in:
Howard Chu 2009-02-08 03:25:48 +00:00
parent b5baf7fd01
commit 4bc8cb6336
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/libldap/cyrus.c
View file

@ -467,6 +467,7 @@ ldap_int_sasl_bind(
ctx = ld->ld_defconn->lconn_sasl_authctx;
#ifdef HAVE_TLS
/* Check for TLS */
ssl = ldap_pvt_tls_sb_ctx( ld->ld_defconn->lconn_sb );
if ( ssl ) {
@ -480,6 +481,7 @@ ldap_int_sasl_bind(
(void) ldap_int_sasl_external( ld, ld->ld_defconn, authid.bv_val, fac );
LDAP_FREE( authid.bv_val );
}
#endif
#if !defined(_WIN32)
/* Check for local */

11
libraries/libldap/tls2.c
View file

@ -74,6 +74,8 @@ static oid_name oids[] = {
{ BER_BVNULL, BER_BVNULL }
};
#ifdef HAVE_TLS
void
ldap_pvt_tls_ctx_free ( void *c )
{
@ -848,13 +850,10 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv )
void *
ldap_pvt_tls_sb_ctx( Sockbuf *sb )
{
#ifdef HAVE_TLS
void *p = NULL;
ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_SSL, (void *)&p );
return p;
#endif
return NULL;
}
int
@ -865,11 +864,9 @@ ldap_pvt_tls_get_strength( void *s )
return tls_imp->ti_session_strength( session );
}
int
ldap_pvt_tls_get_my_dn( void *s, struct berval *dn, LDAPDN_rewrite_dummy *func, unsigned flags )
{
#ifdef HAVE_TLS
tls_session *session = s;
struct berval der_dn;
int rc;
@ -877,10 +874,8 @@ ldap_pvt_tls_get_my_dn( void *s, struct berval *dn, LDAPDN_rewrite_dummy *func,
tls_imp->ti_session_my_dn( session, &der_dn );
rc = ldap_X509dn2bv(&der_dn, dn, (LDAPDN_rewrite_func *)func, flags );
return rc;
#else /* !HAVE_TLS */
return LDAP_NOT_SUPPORTED;
#endif
}
#endif /* HAVE_TLS */
int
ldap_start_tls( LDAP *ld,