r20033: Never commit before testing
authorSimo Sorce <idra@samba.org>
Tue, 5 Dec 2006 03:52:58 +0000 (03:52 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 19:28:51 +0000 (14:28 -0500)
Never commit before testing
Never commit before testing

:-)
(This used to be commit fdd6ce6b7e288137aeaf62f9869441c73bedbd45)

source4/lib/ldb/common/ldb.c

index 733f0bc29a45d8a5885137a336bc082a8d930df5..b52cc8e30178bf893fa835444775830a8ec1177e 100644 (file)
@@ -803,11 +803,12 @@ int ldb_search_exp_fmt(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, struct ldb_
                         struct ldb_dn *base, enum ldb_scope scope, const char * const *attrs,
                         const char *exp_fmt, ...)
 {
-       struct ldb_result **res;
+       struct ldb_result *res;
        char *expression;
        va_list ap;
        int ret;
 
+       res = NULL;
        *result = NULL;
 
        va_start(ap, exp_fmt);
@@ -818,11 +819,13 @@ int ldb_search_exp_fmt(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, struct ldb_
                return LDB_ERR_OPERATIONS_ERROR;
        }
 
-       ret = ldb_search(ldb, base, scope, expression, attrs, res);
+       ret = ldb_search(ldb, base, scope, expression, attrs, &res);
 
        if (ret == LDB_SUCCESS) {
                talloc_steal(mem_ctx, res);
-               result = res;
+               *result = res;
+       } else {
+               talloc_free(res);
        }
 
        talloc_free(expression);