fix ldap namespace (part of ITS#5974)

diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h
index 49138125636c5125f68f24ca706c6612606e48b7..a5cd62ad49ec39cb6d62d96db1a919c56da4b269 100644 (file)
--- 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 8cf2530b399144872389dcbe80c40dd139c76421..4f88dc672a8a22f6bac852b9908d3c83d2699ae6 100644 (file)
--- 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 f079753ed338cc74e6fcc18e0ac234052eae04b5..c4d1d3073cd5d107ec239208709364efc73f6095 100644 (file)
--- 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 8fe77da7a6bd03b79c5048f806ffbdcb56b9c5d8..6c3940f68a824a294d789d69654a64c642dafcea 100644 (file)
--- 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 ff2a2d2b52ba8733d9eecb3ca17ac0066fd09432..33ebd7063149d6b541089ad4f608d93fcaf7811d 100644 (file)
--- 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 a7f8b768e12952336174cb63dcd1e11d46e1633e..eeed0cdc49b7774a4a2cdb7a1b81e6aeb458537b 100644 (file)
--- 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 f03a11be8e388bb6ea1f13848a46cae4f369e8f7..2dfa57f5e66ccdc7786df417168c42a06ab0e1ec 100644 (file)
--- 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,