Attachment 2983 Details for Bug 5090 – Another update of ejs_ldbSearch

[patch] Another update of ejs_ldbSearch

smbcalls_ldb.diff (text/plain), 1.31 KB, created by Matthias Dieter Wallnöfer on 2007-11-18 11:16:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Dieter Wallnöfer

Created: 2007-11-18 11:16:57 UTC

Size: 1.31 KB

patch

obsolete

>Index: scripting/ejs/smbcalls_ldb.c
>===================================================================
>--- scripting/ejs/smbcalls_ldb.c	(revision 26023)
>+++ scripting/ejs/smbcalls_ldb.c	(working copy)
>@@ -78,7 +78,7 @@
> 
> 	ldb = ejs_get_ldb_context(eid);
> 	if (ldb == NULL) {
>-		return -1;
>+		goto failed;
> 	}
> 	
> 	expression = mprToString(argv[0]);
>@@ -126,7 +126,7 @@
> 
> 	res = talloc_zero(tmp_ctx, struct ldb_result);
> 	if (!res) {
>-		return LDB_ERR_OPERATIONS_ERROR;
>+		goto failed;
> 	}
> 
> 	ret = ldb_build_search_req(&req, ldb, tmp_ctx,
>@@ -138,23 +138,23 @@
> 				   res,
> 				   ldb_search_default_callback);
> 
>-	if (ret == LDB_SUCCESS) {
>+	if (ret != LDB_SUCCESS) {
>+		goto failed;
>+	}
> 
>-		ldb_set_timeout(ldb, req, 0); /* use default timeout */
>+	ldb_set_timeout(ldb, req, 0); /* use default timeout */
> 		
>-		ret = ldb_request(ldb, req);
>-		
>-		if (ret == LDB_SUCCESS) {
>-			ret = ldb_wait(req->handle, LDB_WAIT_ALL);
>-		}
>-	}
>+	ret = ldb_request(ldb, req);
>+	
>+	ret |= ldb_wait(req->handle, LDB_WAIT_ALL);
> 
> 	if (ret != LDB_SUCCESS) {
> 		ejsSetErrorMsg(eid, "ldb.search failed - %s", ldb_errstring(ldb));
> 		mpr_Return(eid, mprLdbResult(ldb, ret, NULL));
>-	} else {
>-		mpr_Return(eid, mprLdbResult(ldb, ret, res));
>+		goto failed;
> 	}
>+	
>+	mpr_Return(eid, mprLdbResult(ldb, ret, res));
> 
> 	talloc_free(tmp_ctx);
> 	return 0;

Actions: View

Attachments on bug 5090: 2977 | 2978 | 2979 | 2980 | 2981 | 2982 | 2983