mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-18 11:05:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix ber_scanf and init bugs

Browse Source
This commit is contained in:
Kurt Zeilenga 2000-09-26 17:47:24 +00:00
parent 314363a7f4
commit fcb3ccc526
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
servers/slapd/back-bdb/dn2entry.c
View File

@ -33,7 +33,10 @@ bdb_dn2entry(
Debug(LDAP_DEBUG_TRACE, "bdb_dn2entry: dn: \"%s\"\n",
dn, 0, 0 );
*e = NULL;
if( matched != NULL ) {
*matched = NULL;
rc = bdb_dn2id_matched( be, tid, dn, &id, &matchedDN );
} else {
rc = bdb_dn2id( be, tid, dn, &id );
@ -51,4 +54,4 @@ bdb_dn2entry(
}
return rc;
}
}

14
servers/slapd/entry.c
View File

@ -355,7 +355,7 @@ int entry_decode( struct berval *bv, Entry **entry )
e = (Entry *) ch_malloc( sizeof(Entry) );
if( e == NULL ) {
Debug( LDAP_DEBUG_TRACE,
Debug( LDAP_DEBUG_ANY,
"<= entry_encode: entry allocation failed\n",
0, 0, 0 );
return LDAP_LOCAL_ERROR;
@ -368,12 +368,16 @@ int entry_decode( struct berval *bv, Entry **entry )
e->e_attrs = NULL;
e->e_private = NULL;
rc = ber_scanf( ber, "{ss" /*"}"*/, &e->e_dn, &e->e_ndn );
if( rc < 0 ) {
tag = ber_scanf( ber, "{aa" /*"}"*/, &e->e_dn, &e->e_ndn );
if( tag == LBER_ERROR ) {
free( e );
return LDAP_PROTOCOL_ERROR;
}
Debug( LDAP_DEBUG_TRACE,
"entry_encode: \"%s\"\n",
e->e_dn, 0, 0 );
/* get the attrs */
for ( tag = ber_first_element( ber, &len, &last );
tag != LBER_DEFAULT;
@ -384,9 +388,9 @@ int entry_decode( struct berval *bv, Entry **entry )
AttributeDescription *ad;
const char *text;
rc = ber_scanf( ber, "{O{V}}", &type, &vals );
tag = ber_scanf( ber, "{O{V}}", &type, &vals );
if ( rc == LBER_ERROR ) {
if ( tag == LBER_ERROR ) {
Debug( LDAP_DEBUG_ANY, "entry_decode: decoding error\n", 0, 0, 0 );
entry_free( e );
return LDAP_PROTOCOL_ERROR;