From 4f003dbdafcf57e0a6e77e684d3f8808ccd9c714 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Sun, 12 Oct 2003 08:14:28 +0000
Subject: [PATCH] mv ldap_int_get_controls to ldap_pvt_get_controls

---
 clients/tools/ldapsearch.c     | 5 ++---
 include/ldap_pvt.h             | 3 +++
 libraries/libldap/controls.c   | 2 +-
 libraries/libldap/error.c      | 2 +-
 libraries/libldap/extended.c   | 2 +-
 libraries/libldap/getentry.c   | 2 +-
 libraries/libldap/ldap-int.h   | 4 ----
 libraries/libldap/references.c | 2 +-
 servers/slapd/syncrepl.c       | 3 +--
 9 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 047f055cf5..d2ded3e91a 100644
--- 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 29418a985f..72af273dfc 100644
--- 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 d61be4e436..a5c433ea66 100644
--- 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 e4359eca4f..de5c628a76 100644
--- 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 61b62f53fb..a15365d053 100644
--- 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 1f8ebea022..c39be8c881 100644
--- 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 1ba930d1e5..00f092c68a 100644
--- 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 0e0730f6c8..740896f7fe 100644
--- 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 dae5297ff3..b079892cd3 100644
--- 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,
-- 
2.39.5