[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm ldif2ldbm.c, 1.7, 1.8

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19757

Modified Files:
	ldif2ldbm.c 
Log Message:
[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)



Index: ldif2ldbm.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/ldif2ldbm.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ldif2ldbm.c	19 Apr 2005 22:07:38 -0000	1.7
+++ ldif2ldbm.c	16 Mar 2006 03:02:33 -0000	1.8
@@ -222,15 +222,15 @@
 				&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 );