mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-04-18 15:20:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged ldap_get_values_ber into ldap_get_attribute_ber.

Browse Source
This commit is contained in:
Howard Chu 2002-09-06 04:57:21 +00:00
parent 37d9880495
commit ee30206bc2
4 changed files with 16 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
clients/tools/ldapsearch.c
View File

@ -1388,24 +1388,26 @@ print_entry(
ber_free( ber, 0 );
}
}
#else /* This is the proposed new way of doing things. */
#else
/* This is the proposed new way of doing things.
* It is more * efficient, but the API is non-standard.
*/
static void
print_entry(
LDAP *ld,
LDAPMessage *entry,
int attrsonly)
{
char *ufn;
char *ufn = NULL;
char tmpfname[ 256 ];
char url[ 256 ];
int i, rc;
BerElement *ber = NULL;
struct berval *bvals, bv;
struct berval bv, *bvals, **bvp = &bvals;
LDAPControl **ctrls = NULL;
FILE *tmpfp;
rc = ldap_get_dn_ber( ld, entry, &ber, &bv );
ufn = NULL;
if ( ldif < 2 ) {
ufn = ldap_dn2ufn( bv.bv_val );
@ -1435,17 +1437,17 @@ print_entry(
if( ufn != NULL ) ldap_memfree( ufn );
for ( rc = ldap_get_attribute_ber( ld, entry, ber, &bv ); rc == LDAP_SUCCESS;
rc = ldap_get_attribute_ber( ld, entry, ber, &bv ) )
if ( attrsonly ) bvp = NULL;
for ( rc = ldap_get_attribute_ber( ld, entry, ber, &bv, bvp ); rc == LDAP_SUCCESS;
rc = ldap_get_attribute_ber( ld, entry, ber, &bv, bvp ) )
{
if (bv.bv_val == NULL) break;
if ( attrsonly ) {
write_ldif( LDIF_PUT_NOVALUE, bv.bv_val, NULL, 0 );
/* skip values */
ber_scanf( ber, "x}" );
} else if (( rc = ldap_get_values_ber( ld, entry, ber, &bvals )) == LDAP_SUCCESS ) {
} else {
for ( i = 0; bvals[i].bv_val != NULL; i++ ) {
if ( vals2tmp > 1 || ( vals2tmp
&& ldif_is_not_printable( bvals[i].bv_val, bvals[i].bv_len ) ))

7
include/ldap.h
View File

@ -1306,11 +1306,8 @@ ldap_get_dn_ber LDAP_P((
LDAP_F( int )
ldap_get_attribute_ber LDAP_P((
LDAP *ld, LDAPMessage *e, BerElement *ber, struct berval *attr ));
LDAP_F( int )
ldap_get_values_ber LDAP_P((
LDAP *ld, LDAPMessage *e, BerElement *ber, struct berval **bv ));
LDAP *ld, LDAPMessage *e, BerElement *ber, struct berval *attr,
struct berval **vals ));
/*
* in getattr.c

5
libraries/libldap/getattr.c
View File

@ -121,10 +121,11 @@ ldap_next_attribute( LDAP *ld, LDAPMessage *entry, BerElement *ber )
return attr;
}
/* Fetch attribute type and optionally fetch values */
/* ARGSUSED */
int
ldap_get_attribute_ber( LDAP *ld, LDAPMessage *entry, BerElement *ber,
BerValue *attr )
BerValue *attr, BerVarray *vals )
{
ber_tag_t tag;
int rc = LDAP_SUCCESS;
@ -146,7 +147,7 @@ ldap_get_attribute_ber( LDAP *ld, LDAPMessage *entry, BerElement *ber,
if ( ber_pvt_ber_remaining( ber ) ) {
/* skip sequence, snarf attribute type */
tag = ber_scanf( ber, "{m", attr );
tag = ber_scanf( ber, vals ? "{mW}" : "{mx}", attr, vals );
if( tag == LBER_ERROR ) {
rc = ld->ld_errno = LDAP_DECODING_ERROR;
}

24
libraries/libldap/getvalues.c
View File

@ -144,30 +144,6 @@ ldap_get_values_len( LDAP *ld, LDAPMessage *entry, LDAP_CONST char *target )
return( vals );
}
int
ldap_get_values_ber( LDAP *ld, LDAPMessage *entry, BerElement *ber, BerVarray *bv )
{
int rc = LDAP_SUCCESS;
assert( ld != NULL );
assert( LDAP_VALID( ld ) );
assert( entry != NULL );
assert( ber != NULL );
assert( bv != NULL );
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, ENTRY, "ldap_get_values_ber\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE, "ldap_get_values_ber\n", 0, 0, 0 );
#endif
/* get the array of vals */
if ( ber_scanf( ber, "W}" /* }}} */, bv ) == LBER_ERROR ) {
rc = ld->ld_errno = LDAP_DECODING_ERROR;
}
return( rc );
}
int
ldap_count_values( char **vals )
{