From 0d6e8598467edfb295acd7f4b03be3b4539fa6a0 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Tue, 24 Feb 2009 21:09:41 +0000 Subject: [PATCH] fix ldap namespace (part of ITS#5974) --- include/ldap_pvt.h | 2 +- libraries/libldap/init.c | 4 ++-- libraries/libldap/ldap-int.h | 11 ----------- libraries/libldap/tls.c | 2 +- libraries/libldap/tls2.c | 2 +- servers/slapd/bconfig.c | 2 +- servers/slapd/config.c | 6 +++--- 7 files changed, 9 insertions(+), 20 deletions(-) diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h index 4913812563..a5cd62ad49 100644 --- a/include/ldap_pvt.h +++ b/include/ldap_pvt.h @@ -351,7 +351,7 @@ LDAP_F( struct berval * ) ldap_pvt_str2lowerbv LDAP_P(( char *str, struct berval *bv )); /* tls.c */ -LDAP_F (int) ldap_int_tls_config LDAP_P(( struct ldap *ld, +LDAP_F (int) ldap_pvt_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 )); diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c index 8cf2530b39..4f88dc672a 100644 --- a/libraries/libldap/init.c +++ b/libraries/libldap/init.c @@ -275,7 +275,7 @@ static void openldap_ldap_init_w_conf( break; case ATTR_TLS: #ifdef HAVE_TLS - ldap_int_tls_config( NULL, attrs[i].offset, opt ); + ldap_pvt_tls_config( NULL, attrs[i].offset, opt ); #endif break; case ATTR_OPT_TV: { @@ -429,7 +429,7 @@ static void openldap_ldap_init_w_env( break; case ATTR_TLS: #ifdef HAVE_TLS - ldap_int_tls_config( NULL, attrs[i].offset, value ); + ldap_pvt_tls_config( NULL, attrs[i].offset, value ); #endif break; } diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h index f079753ed3..c4d1d3073c 100644 --- a/libraries/libldap/ldap-int.h +++ b/libraries/libldap/ldap-int.h @@ -486,14 +486,6 @@ LDAP_F (void) ldap_int_utils_init LDAP_P(( void )); */ LDAP_F (int) ldap_log_printf LDAP_P((LDAP *ld, int level, const char *fmt, ...)) LDAP_GCCATTR((format(printf, 3, 4))); -/* - * in cache.c - */ -LDAP_F (void) ldap_add_request_to_cache LDAP_P(( LDAP *ld, ber_tag_t msgtype, - BerElement *request )); -LDAP_F (void) ldap_add_result_to_cache LDAP_P(( LDAP *ld, LDAPMessage *result )); -LDAP_F (int) ldap_check_cache LDAP_P(( LDAP *ld, ber_tag_t msgtype, BerElement *request )); - /* * in controls.c */ @@ -680,9 +672,6 @@ LDAP_F (char *) ldap_int_parse_numericoid LDAP_P(( /* * in tls.c */ -LDAP_F (int) ldap_int_tls_config LDAP_P(( LDAP *ld, - int option, const char *arg )); - LDAP_F (int) ldap_int_tls_start LDAP_P(( LDAP *ld, LDAPConn *conn, LDAPURLDesc *srv )); diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c index 8fe77da7a6..6c3940f68a 100644 --- a/libraries/libldap/tls.c +++ b/libraries/libldap/tls.c @@ -2111,7 +2111,7 @@ ldap_pvt_tls_check_hostname( LDAP *ld, void *s, const char *name_in ) #endif int -ldap_int_tls_config( LDAP *ld, int option, const char *arg ) +ldap_pvt_tls_config( LDAP *ld, int option, const char *arg ) { int i; diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c index ff2a2d2b52..33ebd70631 100644 --- a/libraries/libldap/tls2.c +++ b/libraries/libldap/tls2.c @@ -500,7 +500,7 @@ ldap_pvt_tls_check_hostname( LDAP *ld, void *s, const char *name_in ) } int -ldap_int_tls_config( LDAP *ld, int option, const char *arg ) +ldap_pvt_tls_config( LDAP *ld, int option, const char *arg ) { int i; diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c index a7f8b768e1..eeed0cdc49 100644 --- a/servers/slapd/bconfig.c +++ b/servers/slapd/bconfig.c @@ -3249,7 +3249,7 @@ config_tls_config(ConfigArgs *c) { } return(ldap_pvt_tls_set_option(slap_tls_ld, flag, &i)); } else { - return(ldap_int_tls_config(slap_tls_ld, flag, c->argv[1])); + return(ldap_pvt_tls_config(slap_tls_ld, flag, c->argv[1])); } } #endif diff --git a/servers/slapd/config.c b/servers/slapd/config.c index f03a11be8e..2dfa57f5e6 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -1607,7 +1607,7 @@ int bindconf_tls_set( slap_bindconf *bc, LDAP *ld ) } } if ( bc->sb_tls_reqcert ) { - rc = ldap_int_tls_config( ld, LDAP_OPT_X_TLS_REQUIRE_CERT, + rc = ldap_pvt_tls_config( ld, LDAP_OPT_X_TLS_REQUIRE_CERT, bc->sb_tls_reqcert ); if ( rc ) { Debug( LDAP_DEBUG_ANY, @@ -1618,7 +1618,7 @@ int bindconf_tls_set( slap_bindconf *bc, LDAP *ld ) newctx = 1; } if ( bc->sb_tls_protocol_min ) { - rc = ldap_int_tls_config( ld, LDAP_OPT_X_TLS_PROTOCOL_MIN, + rc = ldap_pvt_tls_config( ld, LDAP_OPT_X_TLS_PROTOCOL_MIN, bc->sb_tls_protocol_min ); if ( rc ) { Debug( LDAP_DEBUG_ANY, @@ -1630,7 +1630,7 @@ int bindconf_tls_set( slap_bindconf *bc, LDAP *ld ) } #ifdef HAVE_OPENSSL_CRL if ( bc->sb_tls_crlcheck ) { - rc = ldap_int_tls_config( ld, LDAP_OPT_X_TLS_CRLCHECK, + rc = ldap_pvt_tls_config( ld, LDAP_OPT_X_TLS_CRLCHECK, bc->sb_tls_crlcheck ); if ( rc ) { Debug( LDAP_DEBUG_ANY, -- 2.39.5