mv ldap_int_get_controls to ldap_pvt_get_controls

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 047f055cf5d647b15709c80c68d282a14b3d231b..d2ded3e91ad6c1c33b9f7490b6c8128610c23f1b 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -1131,11 +1131,10 @@ print_entry(
        }
        write_ldif( LDIF_PUT_VALUE, "dn", bv.bv_val, bv.bv_len );
 
-       rc = ldap_int_get_controls( ber, &ctrls );
-
+       rc = ldap_pvt_get_controls( ber, &ctrls );
        if( rc != LDAP_SUCCESS ) {
                fprintf(stderr, _("print_entry: %d\n"), rc );
-               ldap_perror( ld, "ldap_get_entry_controls" );
+               ldap_perror( ld, "ldap_pvt_get_controls" );
                exit( EXIT_FAILURE );
        }
 

diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h
index 29418a985f68eaf3b3efa807b509045618a7deef..72af273dfcaa7cc22e3496bd771ceb40091f40e5 100644 (file)
--- a/include/ldap_pvt.h
+++ b/include/ldap_pvt.h
@@ -155,6 +155,9 @@ LDAP_F (struct ldapcontrol *) ldap_control_dup LDAP_P((
 LDAP_F (struct ldapcontrol **) ldap_controls_dup LDAP_P((
        struct ldapcontrol *const *ctrls ));
 
+LDAP_F (int) ldap_int_get_controls LDAP_P((
+       BerElement *be,
+       struct ldapcontrol ***ctrlsp));
 
 #ifdef HAVE_CYRUS_SASL
 /* cyrus.c */

diff --git a/libraries/libldap/controls.c b/libraries/libldap/controls.c
index d61be4e43641df908ba0f9469385a437c1a90fef..a5c433ea665389b48c6ac9874bbe9cb13afcc2ff 100644 (file)
--- a/libraries/libldap/controls.c
+++ b/libraries/libldap/controls.c
@@ -114,7 +114,7 @@ ldap_int_put_controls(
        return LDAP_SUCCESS;
 }
 
-int ldap_int_get_controls(
+int ldap_pvt_get_controls(
        BerElement *ber,
        LDAPControl ***ctrls )
 {

diff --git a/libraries/libldap/error.c b/libraries/libldap/error.c
index e4359eca4f1b9ac89e512b77bf371276f572b275..de5c628a76a565aa4d39365347fac413fc153097 100644 (file)
--- a/libraries/libldap/error.c
+++ b/libraries/libldap/error.c
@@ -341,7 +341,7 @@ ldap_parse_result(
                }
 
                if( tag != LBER_ERROR ) {
-                       int rc = ldap_int_get_controls( ber, serverctrls );
+                       int rc = ldap_pvt_get_controls( ber, serverctrls );
 
                        if( rc != LDAP_SUCCESS ) {
                                tag = LBER_ERROR;

diff --git a/libraries/libldap/extended.c b/libraries/libldap/extended.c
index 61b62f53fba5904fb71c54da1d76a34ac82377b1..a15365d05350c3a17e2a3bd58020a90c6e5c7189 100644 (file)
--- a/libraries/libldap/extended.c
+++ b/libraries/libldap/extended.c
@@ -376,7 +376,7 @@ ldap_parse_intermediate (
                goto free_and_return;
        }
 
-       rc = ldap_int_get_controls( ber, serverctrls );
+       rc = ldap_pvt_get_controls( ber, serverctrls );
 
 free_and_return:
        ber_free( ber, 0 );

diff --git a/libraries/libldap/getentry.c b/libraries/libldap/getentry.c
index 1f8ebea02275a961d2718e3d84b0090f202c97bb..c39be8c88100e8eee2dbd81d8443b0ebf44efce7 100644 (file)
--- a/libraries/libldap/getentry.c
+++ b/libraries/libldap/getentry.c
@@ -97,7 +97,7 @@ ldap_get_entry_controls(
                goto cleanup_and_return;
        }
 
-       rc = ldap_int_get_controls( &be, sctrls );
+       rc = ldap_pvt_get_controls( &be, sctrls );
 
 cleanup_and_return:
        if( rc != LDAP_SUCCESS ) {

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index 1ba930d1e57cf1194911e40976033385b762c09d..00f092c68ac2ec7f7357677fe2aca5161daf7730 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -402,10 +402,6 @@ LDAP_F (int) ldap_check_cache LDAP_P(( LDAP *ld, ber_tag_t msgtype, BerElement *
 /*
  * in controls.c
  */
-LDAP_F (int) ldap_int_get_controls LDAP_P((
-       BerElement *be,
-       LDAPControl ***ctrlsp));
-
 LDAP_F (int) ldap_int_put_controls LDAP_P((
        LDAP *ld,
        LDAPControl *const *ctrls,

diff --git a/libraries/libldap/references.c b/libraries/libldap/references.c
index 0e0730f6c896876246b34a9063e0386c6634844d..740896f7fe0e475405cf272e66b93fb3cbd33353 100644 (file)
--- a/libraries/libldap/references.c
+++ b/libraries/libldap/references.c
@@ -106,7 +106,7 @@ ldap_parse_reference(
                goto free_and_return;
        }
 
-       rc = ldap_int_get_controls( &be, serverctrls );
+       rc = ldap_pvt_get_controls( &be, serverctrls );
 
 free_and_return:
 

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index dae5297ff3aaf1294392fd25d720164f5e0ef134..b079892cd34862449478aa5cc6b9dee9f90fa6c2 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -805,8 +805,7 @@ syncrepl_message_to_entry(
 
        ber_scanf( ber, "{xx" );
 
-       rc = ldap_int_get_controls( ber, &rctrls );
-
+       rc = ldap_pvt_get_controls( ber, &rctrls );
        if ( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, ERR,