Commit b849aae2 authored by Howard Chu's avatar Howard Chu
Browse files

Sync with HEAD

parent 4e06cfeb
...@@ -330,7 +330,7 @@ static int r_enum_tree(enumCookie *ck, struct berval *path, ...@@ -330,7 +330,7 @@ static int r_enum_tree(enumCookie *ck, struct berval *path,
? LDAP_SCOPE_BASE : LDAP_SCOPE_SUBTREE ); ? LDAP_SCOPE_BASE : LDAP_SCOPE_SUBTREE );
ck->rs->sr_entry = e; ck->rs->sr_entry = e;
rc = send_search_reference( ck->op, ck->rs ) < 0; rc = send_search_reference( ck->op, ck->rs );
ber_bvarray_free( ck->rs->sr_ref ); ber_bvarray_free( ck->rs->sr_ref );
ber_bvarray_free( erefs ); ber_bvarray_free( erefs );
ck->rs->sr_ref = NULL; ck->rs->sr_ref = NULL;
...@@ -341,12 +341,12 @@ static int r_enum_tree(enumCookie *ck, struct berval *path, ...@@ -341,12 +341,12 @@ static int r_enum_tree(enumCookie *ck, struct berval *path,
ck->rs->sr_entry = e; ck->rs->sr_entry = e;
ck->rs->sr_attrs = ck->op->ors_attrs; ck->rs->sr_attrs = ck->op->ors_attrs;
ck->rs->sr_flags = REP_ENTRY_MODIFIABLE; ck->rs->sr_flags = REP_ENTRY_MODIFIABLE;
rc = send_search_entry(ck->op, ck->rs) < 0; rc = send_search_entry(ck->op, ck->rs);
ck->rs->sr_entry = NULL; ck->rs->sr_entry = NULL;
} }
fd = 1; fd = 1;
if ( rc ) if ( rc )
goto leave; goto done;
} else { } else {
/* Queueing up for tool mode */ /* Queueing up for tool mode */
if(ck->entries == NULL) { if(ck->entries == NULL) {
...@@ -382,7 +382,7 @@ static int r_enum_tree(enumCookie *ck, struct berval *path, ...@@ -382,7 +382,7 @@ static int r_enum_tree(enumCookie *ck, struct berval *path,
"=> ldif_enum_tree: failed to opendir %s (%d)\n", "=> ldif_enum_tree: failed to opendir %s (%d)\n",
path->bv_val, errno, 0 ); path->bv_val, errno, 0 );
} }
goto leave; goto done;
} }
while(1) { while(1) {
...@@ -453,7 +453,7 @@ static int r_enum_tree(enumCookie *ck, struct berval *path, ...@@ -453,7 +453,7 @@ static int r_enum_tree(enumCookie *ck, struct berval *path,
free(ptr); free(ptr);
} }
} }
leave: done:
if ( fd ) entry_free( e ); if ( fd ) entry_free( e );
return rc; return rc;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment