upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-26 01:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

mv ldap_int_get_controls to ldap_pvt_get_controls

Browse source
This commit is contained in:
Kurt Zeilenga 2003-10-12 08:14:28 +00:00
parent 10622b1d0a
commit 4f003dbdaf
9 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
clients/tools/ldapsearch.c
View file

@ -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 );
}

3
include/ldap_pvt.h
View file

@ -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 */

2
libraries/libldap/controls.c
View file

@ -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 )
{

2
libraries/libldap/error.c
View file

@ -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;

2
libraries/libldap/extended.c
View file

@ -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 );

2
libraries/libldap/getentry.c
View file

@ -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 ) {

4
libraries/libldap/ldap-int.h
View file

@ -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,

2
libraries/libldap/references.c
View file

@ -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:

3
servers/slapd/syncrepl.c
View file

@ -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,