Commit 4f003dbd authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

mv ldap_int_get_controls to ldap_pvt_get_controls

parent 10622b1d
......@@ -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 );
}
......
......@@ -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 */
......
......@@ -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 )
{
......
......@@ -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;
......
......@@ -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 );
......
......@@ -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 ) {
......
......@@ -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,
......
......@@ -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:
......
......@@ -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,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment