next = s;
/* initialize reader/writer lock */
- e = (Entry *) ch_calloc( 1, sizeof(Entry) );
+ e = (Entry *) ch_malloc( sizeof(Entry) );
if( e == NULL ) {
Debug( LDAP_DEBUG_TRACE,
return( NULL );
}
+ /* initialize entry */
e->e_id = NOID;
+ e->e_dn = NULL;
+ e->e_ndn = NULL;
+ e->e_attrs = NULL;
e->e_private = NULL;
/* dn + attributes */
- e->e_attrs = NULL;
vals[0] = &bval;
vals[1] = NULL;
ptype[0] = '\0';
+
while ( (s = ldif_getline( &next )) != NULL ) {
if ( *s == '\n' || *s == '\0' ) {
break;
continue;
}
e->e_dn = value != NULL ? value : ch_strdup( "" );
-
- if ( e->e_ndn != NULL ) {
- Debug( LDAP_DEBUG_ANY,
- "str2entry: entry %ld already has a normalized dn \"%s\" for \"%s\" (first ignored)\n",
- e->e_id, e->e_ndn,
- value != NULL ? value : NULL );
- free( e->e_ndn );
- }
- e->e_ndn = ch_strdup( e->e_dn );
- (void) dn_normalize_case( e->e_ndn );
continue;
}
return( NULL );
}
- if ( e->e_ndn == NULL ) {
- Debug( LDAP_DEBUG_ANY,
- "str2entry: entry %ld (\"%s\") has no normalized dn\n",
- e->e_id, e->e_dn, 0 );
- entry_free( e );
- return( NULL );
- }
+ /* generate normalized dn */
+ e->e_ndn = ch_strdup( e->e_dn );
+ (void) dn_normalize( e->e_ndn );
Debug(LDAP_DEBUG_TRACE, "<= str2entry(%s) -> %ld (0x%lx)\n",
e->e_dn, e->e_id, (unsigned long)e );