r12733: Merge ldap/ldb controls into main tree

[sfrench/samba-autobuild/.git] / source4 / lib / ldb / ldb_sqlite3 / ldb_sqlite3.c

diff --git a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c b/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
index 1d23478941c837a58b0cc6383c9a3595cf377ce0..464c8ce69fa5b1fcc58d02d8a31100ae734d8156 100644 (file)
--- a/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
+++ b/source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
@@ -984,6 +984,7 @@ static int lsqlite3_search_bytree(struct ldb_module * module, const struct ldb_d
 
        (*res)->msgs = talloc_steal(*res, msgs.msgs);
        (*res)->count = msgs.count;
+       (*res)->controls = NULL;
 
        talloc_free(local_ctx);
        return LDB_SUCCESS;
@@ -1783,6 +1784,11 @@ destructor(void *p)
 
 static int lsqlite3_request(struct ldb_module *module, struct ldb_request *req)
 {
+       /* check for oustanding critical controls and return an error if found */
+       if (check_critical_controls(req->controls)) {
+               return LDB_ERR_UNSUPPORTED_CRITICAL_EXTENSION;
+       }
+       
        switch (req->operation) {
 
        case LDB_REQ_SEARCH:
@@ -1791,7 +1797,7 @@ static int lsqlite3_request(struct ldb_module *module, struct ldb_request *req)
                                          req->op.search.scope, 
                                          req->op.search.tree, 
                                          req->op.search.attrs, 
-                                         req->op.search.res);
+                                         &req->op.search.res);
 
        case LDB_REQ_ADD:
                return lsqlite3_add(module, req->op.add.message);