ITS#5916 - externally callable functions are ldap_pvt, not ldap_int.

include/ldap_pvt.h

@@ -304,6 +304,34 @@ LDAP_F( int )
 ldap_bv2escaped_filter_value_x LDAP_P(( struct berval *in, struct berval *out,
 	int inplace, void *ctx ));
 
+LDAP_F (int) ldap_pvt_search LDAP_P((
+	struct ldap *ld,
+	LDAP_CONST char *base,
+	int scope,
+	LDAP_CONST char *filter,
+	char **attrs,
+	int attrsonly,
+	struct ldapcontrol **sctrls,
+	struct ldapcontrol **cctrls,
+	struct timeval *timeout,
+	int sizelimit,
+	int deref,
+	int *msgidp ));
+
+LDAP_F(int) ldap_pvt_search_s LDAP_P((
+	struct ldap *ld,
+	LDAP_CONST char *base,
+	int scope,
+	LDAP_CONST char *filter,
+	char **attrs,
+	int attrsonly,
+	struct ldapcontrol **sctrls,
+	struct ldapcontrol **cctrls,
+	struct timeval *timeout,
+	int sizelimit,
+	int deref,
+	struct ldapmsg **res ));
+
 /* string.c */
 LDAP_F( char * )
 ldap_pvt_str2upper LDAP_P(( char *str ));

libraries/libldap/ldap-int.h

@@ -591,34 +591,6 @@ LDAP_F (const char *) ldap_int_msgtype2str( ber_tag_t tag );
 /*
  * in search.c
  */
-LDAP_F (int) ldap_int_search LDAP_P((
-	LDAP *ld,
-	LDAP_CONST char *base,
-	int scope,
-	LDAP_CONST char *filter,
-	char **attrs,
-	int attrsonly,
-	LDAPControl **sctrls,
-	LDAPControl **cctrls,
-	struct timeval *timeout,
-	int sizelimit,
-	int deref,
-	int *msgidp ));
-
-LDAP_F(int) ldap_int_search_s LDAP_P((
-	LDAP *ld,
-	LDAP_CONST char *base,
-	int scope,
-	LDAP_CONST char *filter,
-	char **attrs,
-	int attrsonly,
-	LDAPControl **sctrls,
-	LDAPControl **cctrls,
-	struct timeval *timeout,
-	int sizelimit,
-	int deref,
-	LDAPMessage **res ));
-
 LDAP_F (BerElement *) ldap_build_search_req LDAP_P((
 	LDAP *ld,
 	const char *base,

libraries/libldap/search.c

@@ -66,12 +66,12 @@ ldap_search_ext(
 	int sizelimit,
 	int *msgidp )
 {
-	return ldap_int_search( ld, base, scope, filter, attrs,
+	return ldap_pvt_search( ld, base, scope, filter, attrs,
 		attrsonly, sctrls, cctrls, timeout, sizelimit, -1, msgidp );
 }
 
 int
-ldap_int_search(
+ldap_pvt_search(
 	LDAP *ld,
 	LDAP_CONST char *base,
 	int scope,
@@ -147,12 +147,12 @@ ldap_search_ext_s(
 	int sizelimit,
 	LDAPMessage **res )
 {
-	return ldap_int_search_s( ld, base, scope, filter, attrs,
+	return ldap_pvt_search_s( ld, base, scope, filter, attrs,
 		attrsonly, sctrls, cctrls, timeout, sizelimit, -1, res );
 }
 
 int
-ldap_int_search_s(
+ldap_pvt_search_s(
 	LDAP *ld,
 	LDAP_CONST char *base,
 	int scope,
@@ -169,7 +169,7 @@ ldap_int_search_s(
 	int rc;
 	int	msgid;
 
-	rc = ldap_int_search( ld, base, scope, filter, attrs, attrsonly,
+	rc = ldap_pvt_search( ld, base, scope, filter, attrs, attrsonly,
 		sctrls, cctrls, timeout, sizelimit, deref, &msgid );
 
 	if ( rc != LDAP_SUCCESS ) {

servers/slapd/back-ldap/search.c

@@ -215,7 +215,7 @@ ldap_back_search(
 	/* deal with <draft-zeilenga-ldap-t-f> filters */
 	filter = op->ors_filterstr;
 retry:
-	rs->sr_err = ldap_int_search( lc->lc_ld, op->o_req_dn.bv_val,
+	rs->sr_err = ldap_pvt_search( lc->lc_ld, op->o_req_dn.bv_val,
 			op->ors_scope, filter.bv_val,
 			attrs, op->ors_attrsonly, ctrls, NULL,
 			tv.tv_sec ? &tv : NULL,
@@ -847,7 +847,7 @@ retry:
 	}
 
 	/* TODO: timeout? */
-	rc = ldap_int_search_s( lc->lc_ld, ndn->bv_val, LDAP_SCOPE_BASE, filter,
+	rc = ldap_pvt_search_s( lc->lc_ld, ndn->bv_val, LDAP_SCOPE_BASE, filter,
 				attrp, 0, ctrls, NULL,
 				NULL, LDAP_NO_LIMIT, op->ors_deref, &result );
 	if ( rc != LDAP_SUCCESS ) {

servers/slapd/back-meta/search.c

@@ -603,7 +603,7 @@ retry:;
 	 * Starts the search
 	 */
 	assert( msc->msc_ld != NULL );
-	rc = ldap_int_search( msc->msc_ld,
+	rc = ldap_pvt_search( msc->msc_ld,
 			mbase.bv_val, realscope, mfilter.bv_val,
 			mapped_attrs, op->ors_attrsonly,
 			ctrls, NULL, tvp, op->ors_slimit, op->ors_deref,