From a3f61dea40d8a907d56abe1c0eee980f78228b79 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Sun, 17 Oct 2010 14:27:18 +0200 Subject: Revert "s4:remove "util_ldb" submodule and integrate the three gendb_* calls in "dsdb/common/util.c"" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8a2ce5c47cee499f90b125ebde83de5f9f1a9aa0. Jelmer pointed out that these are also in use by other LDB databases - not only SAMDB ones. Autobuild-User: Matthias Dieter Wallnöfer Autobuild-Date: Sun Oct 17 13:37:16 UTC 2010 on sn-devel-104 --- source4/dsdb/common/util.c | 87 +--------------------------------------------- 1 file changed, 1 insertion(+), 86 deletions(-) (limited to 'source4/dsdb/common') diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c index b7f6b69fce..9e6ccbc911 100644 --- a/source4/dsdb/common/util.c +++ b/source4/dsdb/common/util.c @@ -26,6 +26,7 @@ #include "ldb.h" #include "ldb_module.h" #include "ldb_errors.h" +#include "../lib/util/util_ldb.h" #include "../lib/crypto/crypto.h" #include "dsdb/samdb/samdb.h" #include "libcli/security/security.h" @@ -43,92 +44,6 @@ #include "lib/socket/socket.h" #include "librpc/gen_ndr/irpc.h" -/* - * search the SAMDB for the specified attributes - va_list variant - */ -int gendb_search_v(struct ldb_context *ldb, - TALLOC_CTX *mem_ctx, - struct ldb_dn *basedn, - struct ldb_message ***msgs, - const char * const *attrs, - const char *format, - va_list ap) -{ - enum ldb_scope scope = LDB_SCOPE_SUBTREE; - struct ldb_result *res; - char *expr = NULL; - int ret; - - if (format) { - expr = talloc_vasprintf(mem_ctx, format, ap); - if (expr == NULL) { - return -1; - } - } else { - scope = LDB_SCOPE_BASE; - } - - res = NULL; - - ret = ldb_search(ldb, mem_ctx, &res, basedn, scope, attrs, - expr?"%s":NULL, expr); - - if (ret == LDB_SUCCESS) { - talloc_steal(mem_ctx, res->msgs); - - DEBUG(6,("gendb_search_v: %s %s -> %d\n", - basedn?ldb_dn_get_linearized(basedn):"NULL", - expr?expr:"NULL", res->count)); - - ret = res->count; - *msgs = res->msgs; - talloc_free(res); - } else if (scope == LDB_SCOPE_BASE && ret == LDB_ERR_NO_SUCH_OBJECT) { - ret = 0; - *msgs = NULL; - } else { - DEBUG(4,("gendb_search_v: search failed: %s\n", - ldb_errstring(ldb))); - ret = -1; - } - - talloc_free(expr); - - return ret; -} - -/* - * search the SAMDB for the specified attributes - varargs variant - */ -int gendb_search(struct ldb_context *ldb, - TALLOC_CTX *mem_ctx, - struct ldb_dn *basedn, - struct ldb_message ***res, - const char * const *attrs, - const char *format, ...) -{ - va_list ap; - int count; - - va_start(ap, format); - count = gendb_search_v(ldb, mem_ctx, basedn, res, attrs, format, ap); - va_end(ap); - - return count; -} - -/* - * search the SAMDB for a specified record (by DN) - */ -int gendb_search_dn(struct ldb_context *ldb, - TALLOC_CTX *mem_ctx, - struct ldb_dn *dn, - struct ldb_message ***res, - const char * const *attrs) -{ - return gendb_search(ldb, mem_ctx, dn, res, attrs, NULL); -} - /* search the sam for the specified attributes in a specific domain, filter on objectSid being in domain_sid. -- cgit