r26003: Split up DB_WRAP, as first step in an attempt to sanitize dependencies.

(This used to be commit 56dfcb4f2f8e74c9d8b2fe3a0df043781188a555)

3 files changed, 192 insertions, 4 deletions

diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index 0691bd7889..01ad14aa95 100644
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -49,12 +49,14 @@ PUBLIC_DEPENDENCIES = XATTR
 # End SUBSYSTEM WRAP_XATTR
 ################################################
 
-################################################
-# Start SUBSYSTEM UTIL_TDB
 [SUBSYSTEM::UTIL_TDB]
 PUBLIC_PROTO_HEADER = util_tdb.h
 OBJ_FILES = \
 		util_tdb.o
 PUBLIC_DEPENDENCIES = LIBTDB
-# End SUBSYSTEM UTIL_TDB
-################################################
+
+[SUBSYSTEM::UTIL_LDB]
+PUBLIC_PROTO_HEADER = util_ldb.h
+OBJ_FILES = \
+			util_ldb.o
+PUBLIC_DEPENDENCIES = LIBLDB
diff --git a/source4/lib/util/util_ldb.c b/source4/lib/util/util_ldb.c
new file mode 100644
index 0000000000..ba8443c236
--- /dev/null
+++ b/source4/lib/util/util_ldb.c
@@ -0,0 +1,131 @@
+/* 
+   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/ldb/include/ldb_errors.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)  _PRINTF_ATTRIBUTE(6,0)
+{
+	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, basedn, scope, expr, attrs, &res);
+
+	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", 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, ...) _PRINTF_ATTRIBUTE(6,7)
+{
+	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);
+}
+
+/*
+  setup some initial ldif in a ldb
+*/
+int gendb_add_ldif(struct ldb_context *ldb, const char *ldif_string)
+{
+	struct ldb_ldif *ldif;
+	int ret;
+	ldif = ldb_ldif_read_string(ldb, &ldif_string);
+	if (ldif == NULL) return -1;
+	ret = ldb_add(ldb, ldif->msg);
+	talloc_free(ldif);
+	return ret;
+}
+
+char *wrap_casefold(void *context, void *mem_ctx, const char *s)
+{
+	return strupper_talloc(mem_ctx, s);
+}
+
+
diff --git a/source4/lib/util/util_ldb.h b/source4/lib/util/util_ldb.h
new file mode 100644
index 0000000000..f4f56d6b18
--- /dev/null
+++ b/source4/lib/util/util_ldb.h
@@ -0,0 +1,55 @@
+#ifndef __LIB_UTIL_UTIL_LDB_H__
+#define __LIB_UTIL_UTIL_LDB_H__
+
+#undef _PRINTF_ATTRIBUTE
+#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
+/* This file was automatically generated by mkproto.pl. DO NOT EDIT */
+
+#ifndef _PUBLIC_
+#define _PUBLIC_
+#endif
+
+#ifndef _PURE_
+#define _PURE_
+#endif
+
+#ifndef _NORETURN_
+#define _NORETURN_
+#endif
+
+#ifndef _DEPRECATED_
+#define _DEPRECATED_
+#endif
+
+#ifndef _WARN_UNUSED_RESULT_
+#define _WARN_UNUSED_RESULT_
+#endif
+
+
+/* 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);
+#undef _PRINTF_ATTRIBUTE
+#define _PRINTF_ATTRIBUTE(a1, a2)
+
+#endif /* __LIB_UTIL_UTIL_LDB_H__ */
+