From 5c701066571f8ff173a9bc8ade0439c4a1587b61 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Fri, 5 Apr 2002 06:48:03 +0000 Subject: [PATCH] ITS#1708 ldap_pvt_tls_sb_ctx() et al --- include/ldap_pvt.h | 5 ++++- libraries/libldap/tls.c | 2 +- servers/slapd/connection.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h index 93726953d6..8a794e6f05 100644 --- a/include/ldap_pvt.h +++ b/include/ldap_pvt.h @@ -163,6 +163,8 @@ LDAP_F( char * ) ldap_pvt_str2lower LDAP_P(( char *str )); /* tls.c */ +LDAP_F (int) ldap_int_tls_config LDAP_P(( struct ldap *ld, + int option, const char *arg )); LDAP_F (int) ldap_pvt_tls_get_option LDAP_P(( struct ldap *ld, int option, void *arg )); LDAP_F (int) ldap_pvt_tls_set_option LDAP_P(( struct ldap *ld, @@ -170,9 +172,10 @@ LDAP_F (int) ldap_pvt_tls_set_option LDAP_P(( struct ldap *ld, LDAP_F (void) ldap_pvt_tls_destroy LDAP_P(( void )); LDAP_F (int) ldap_pvt_tls_init LDAP_P(( void )); +LDAP_F (int) ldap_pvt_tls_init_def_ctx LDAP_P(( void )); LDAP_F (int) ldap_pvt_tls_accept LDAP_P(( Sockbuf *sb, void *ctx_arg )); LDAP_F (int) ldap_pvt_tls_inplace LDAP_P(( Sockbuf *sb )); -LDAP_F (void *) ldap_pvt_tls_get_ctx LDAP_P(( Sockbuf *sb )); +LDAP_F (void *) ldap_pvt_tls_sb_ctx LDAP_P(( Sockbuf *sb )); LDAP_F (int) ldap_pvt_tls_init_default_ctx LDAP_P(( void )); diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c index 5db2b70ede..2b755120d9 100644 --- a/libraries/libldap/tls.c +++ b/libraries/libldap/tls.c @@ -1236,7 +1236,7 @@ ldap_int_tls_start ( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv ) return (ld->ld_errno); } - ssl = (void *) ldap_pvt_tls_sb_ctx( sb ); + ssl = ldap_pvt_tls_sb_ctx( sb ); assert( ssl != NULL ); /* diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c index cbd5f82a3d..91bd47a2aa 100644 --- a/servers/slapd/connection.c +++ b/servers/slapd/connection.c @@ -1137,7 +1137,7 @@ int connection_read(ber_socket_t s) c->c_needs_tls_accept = 0; /* we need to let SASL know */ - ssl = (void *)ldap_pvt_tls_sb_ctx( c->c_sb ); + ssl = ldap_pvt_tls_sb_ctx( c->c_sb ); c->c_tls_ssf = (slap_ssf_t) ldap_pvt_tls_get_strength( ssl ); if( c->c_tls_ssf > c->c_ssf ) { -- 2.39.5