s4:remove "util_ldb" submodule and integrate the three gendb_* calls in "dsdb/common/util.c"

They're only in use by SAMDB code.

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Sun Oct 17 09:40:13 UTC 2010 on sn-devel-104

3 files changed, 0 insertions, 150 deletions

diff --git a/lib/util/util_ldb.c b/lib/util/util_ldb.c
deleted file mode 100644
index 738d50052d..0000000000
--- a/lib/util/util_ldb.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-
-   common share info functions
-
-   Copyright (C) Andrew Tridgell 2004
-   Copyright (C) Tim Potter 2004
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "lib/ldb/include/ldb.h"
-#include "../lib/util/util_ldb.h"
-/*
-  search the sam 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 LDB 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 LDB 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);
-}
-
diff --git a/lib/util/util_ldb.h b/lib/util/util_ldb.h
deleted file mode 100644
index f9eb028916..0000000000
--- a/lib/util/util_ldb.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __LIB_UTIL_UTIL_LDB_H__
-#define __LIB_UTIL_UTIL_LDB_H__
-
-struct ldb_dn;
-
-/* The following definitions come from lib/util/util_ldb.c  */
-
-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)  PRINTF_ATTRIBUTE(6,0);
-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, ...) PRINTF_ATTRIBUTE(6,7);
-int gendb_search_dn(struct ldb_context *ldb,
-		 TALLOC_CTX *mem_ctx,
-		 struct ldb_dn *dn,
-		 struct ldb_message ***res,
-		 const char * const *attrs);
-int gendb_add_ldif(struct ldb_context *ldb, const char *ldif_string);
-char *wrap_casefold(void *context, void *mem_ctx, const char *s, size_t n);
-
-#endif /* __LIB_UTIL_UTIL_LDB_H__ */
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 91c85f0837..b551953f93 100644
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -47,15 +47,6 @@ bld.SAMBA_SUBSYSTEM('UTIL_TEVENT',
 	header_path=[ ('*', 'util') ],
 	)
 
-
-bld.SAMBA_SUBSYSTEM('UTIL_LDB',
-	source='util_ldb.c',
-        local_include=False,
-	public_deps='ldb',
-        public_headers='util_ldb.h'
-	)
-
-
 bld.SAMBA_SUBSYSTEM('UTIL_RUNCMD',
 	source='util_runcmd.c',
 	local_include=False,