diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2006-03-16 03:02:33 +0000 |
|---|---|---|
| committer | Noriko Hosoi <nhosoi@redhat.com> | 2006-03-16 03:02:33 +0000 |
| commit | 0ffc6a2983a8c76f8043a14ed601099366d5b2b2 (patch) | |
| tree | 4f169a7d29a8b609907b4d28e7e54d6e8770b6f4 | |
| parent | 7ec2e6103b976a4cd5e49dc52cc510c225898e3d (diff) | |
[185477] ldif2db allows entries without a parent to be imported
if idl is NULL, changed add_op_attrs to always set IMPORT_ADD_OP_ATTRS_NO_PARENT in non-error case (err == 0 or err == DB_NOTFOUND)
| -rw-r--r-- | ldap/servers/slapd/back-ldbm/ldif2ldbm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c index 42c7c06b..13c8ad89 100644 --- a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c +++ b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c @@ -222,15 +222,15 @@ int add_op_attrs(Slapi_PBlock *pb, struct ldbminfo *li, struct backentry *ep, &err )) != NULL ) { pid = idl_firstid( idl ); idl_free( idl ); - } else if ( 0 != err ) { - if (DB_NOTFOUND != err ) { + } else { + /* empty idl */ + if ( 0 != err && DB_NOTFOUND != err ) { LDAPDebug( LDAP_DEBUG_ANY, "database error %d\n", err, 0, 0 ); slapi_ch_free( (void**)&pdn ); return( -1 ); - } else { - if (NULL != status) { - *status = IMPORT_ADD_OP_ATTRS_NO_PARENT; - } + } + if (NULL != status) { + *status = IMPORT_ADD_OP_ATTRS_NO_PARENT; } } slapi_ch_free( (void**)&pdn ); |