mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Populate nvals via entry_decode

Browse Source
This commit is contained in:
Kurt Zeilenga 2003-02-26 01:09:20 +00:00
parent 88990a5c6a
commit 793dada79c
1 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
servers/slapd/entry.c
View File

@ -243,7 +243,6 @@ str2entry( char *s )
nvalsp = NULL; nvalsp = NULL;
nvals[0].bv_val = NULL; nvals[0].bv_val = NULL;
#if 0
if( ad->ad_type->sat_equality && if( ad->ad_type->sat_equality &&
ad->ad_type->sat_equality->smr_match && ad->ad_type->sat_equality->smr_match &&
ad->ad_type->sat_syntax->ssyn_normalize ) ad->ad_type->sat_syntax->ssyn_normalize )
@ -259,13 +258,13 @@ str2entry( char *s )
#else #else
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"<= str2entry NULL (ssyn_normalize %d)\n", rc, 0, 0 ); "<= str2entry NULL (ssyn_normalize %d)\n", rc, 0, 0 );
#endif
entry_free( e ); entry_free( e );
free( vals[0].bv_val ); free( vals[0].bv_val );
free( type ); free( type );
return NULL; return NULL;
} }
#endif
nvals[1].bv_len = 0; nvals[1].bv_len = 0;
nvals[1].bv_val = NULL; nvals[1].bv_val = NULL;
@ -273,7 +272,6 @@ str2entry( char *s )
nvalsp = &nvals[0]; nvalsp = &nvals[0];
} }
#endif #endif
#endif
#ifdef SLAP_NVALUES #ifdef SLAP_NVALUES
rc = attr_merge( e, ad, vals, nvalsp ); rc = attr_merge( e, ad, vals, nvalsp );
@ -596,7 +594,7 @@ int entry_encode(Entry *e, struct berval *bv)
*/ */
int entry_decode(struct berval *bv, Entry **e) int entry_decode(struct berval *bv, Entry **e)
{ {
int i, j; int i, j, count;
int rc; int rc;
Attribute *a; Attribute *a;
Entry *x; Entry *x;
@ -669,7 +667,7 @@ int entry_decode(struct berval *bv, Entry **e)
bptr = (BerVarray)(a+1); bptr = (BerVarray)(a+1);
a->a_vals = bptr; a->a_vals = bptr;
a->a_flags = 0; a->a_flags = 0;
j = entry_getlen(&ptr); count = j = entry_getlen(&ptr);
while (j) { while (j) {
i = entry_getlen(&ptr); i = entry_getlen(&ptr);
@ -682,9 +680,37 @@ int entry_decode(struct berval *bv, Entry **e)
bptr->bv_val = NULL; bptr->bv_val = NULL;
bptr->bv_len = 0; bptr->bv_len = 0;
bptr++; bptr++;
#ifdef SLAP_NVALUES
if( count && ad->ad_type->sat_equality &&
ad->ad_type->sat_equality->smr_match &&
ad->ad_type->sat_syntax->ssyn_normalize )
{
a->a_nvals = ch_malloc((count+1)*sizeof(struct berval));
for(j=0; j<count; j++) {
rc = ad->ad_type->sat_syntax->ssyn_normalize(
ad->ad_type->sat_syntax,
&a->a_vals[j], &a->a_nvals[j] );
if( rc ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, DETAIL1,
"str2entry: NULL (ssyn_normalize %d)\n" , rc, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"<= str2entry NULL (ssyn_normalize %d)\n", rc, 0, 0 );
#endif
return rc;
}
}
}
#endif
} }
if (a)
a->a_next = NULL; if (a) a->a_next = NULL;
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( OPERATION, DETAIL1, "entry_decode: %s\n", x->e_dn, 0, 0 ); LDAP_LOG( OPERATION, DETAIL1, "entry_decode: %s\n", x->e_dn, 0, 0 );
#else #else