s3:dbwrap: move the db_open_rbt() prototype to a new header dbwrap_rbt.h

diff --git a/source3/lib/dbwrap/dbwrap.h b/source3/lib/dbwrap/dbwrap.h
index ab52783388fee098f394f75e03ee70282ac2f4d1..dbefe7bfd604cbc68a392ade00261fe0f761478a 100644 (file)
--- a/source3/lib/dbwrap/dbwrap.h
+++ b/source3/lib/dbwrap/dbwrap.h
@@ -56,8 +56,6 @@ struct db_context {
        bool persistent;
 };
 
-struct db_context *db_open_rbt(TALLOC_CTX *mem_ctx);
-
 
 NTSTATUS dbwrap_delete(struct db_context *db, TDB_DATA key);
 NTSTATUS dbwrap_store(struct db_context *db, TDB_DATA key,

diff --git a/source3/lib/dbwrap/dbwrap_rbt.c b/source3/lib/dbwrap/dbwrap_rbt.c
index fa91d8cb95980c229db4a447a60e857c38a17534..699f922fa517815679f92d308f98d371d953ba29 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_rbt.c
+++ b/source3/lib/dbwrap/dbwrap_rbt.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_rbt.h"
 #include "../lib/util/rbtree.h"
 
 #define DBWRAP_RBT_ALIGN(_size_) (((_size_)+15)&~15)

diff --git a/source3/lib/dbwrap/dbwrap_rbt.h b/source3/lib/dbwrap/dbwrap_rbt.h
new file mode 100644 (file)
index 0000000..1716879
--- /dev/null
+++ b/source3/lib/dbwrap/dbwrap_rbt.h
@@ -0,0 +1,29 @@
+/*
+   Unix SMB/CIFS implementation.
+   Database interface wrapper around red-black trees
+   Copyright (C) Volker Lendecke 2007, 2008
+
+   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/>.
+*/
+
+#ifndef __DBWRAP_RBT_H__
+#define __DBWRAP_RBT_H__
+
+#include <talloc.h>
+
+struct db_context;
+
+struct db_context *db_open_rbt(TALLOC_CTX *mem_ctx);
+
+#endif /* __DBWRAP_RBT_H__ */

diff --git a/source3/lib/talloc_dict.c b/source3/lib/talloc_dict.c
index 3c5108d3880132c32f12b6d19b73d8cfd8dd1466..b7d4fe0dabd1e9e5fafbfa421f7df83efedb5ce2 100644 (file)
--- a/source3/lib/talloc_dict.c
+++ b/source3/lib/talloc_dict.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_rbt.h"
 #include "talloc_dict.h"
 #include "util_tdb.h"
 

diff --git a/source3/libnet/libnet_dssync_passdb.c b/source3/libnet/libnet_dssync_passdb.c
index 99a7b8019b04f51f018dca119ea78971d3eb4421..7ef73d722e1ac828f711a5c23363ca9077c33de3 100644 (file)
--- a/source3/libnet/libnet_dssync_passdb.c
+++ b/source3/libnet/libnet_dssync_passdb.c
@@ -25,6 +25,7 @@
 #include "../librpc/gen_ndr/ndr_drsuapi.h"
 #include "util_tdb.h"
 #include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_rbt.h"
 #include "../libds/common/flag_mapping.h"
 #include "passdb.h"
 

diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index 0e04105ef9d291e11e41e891e0ec968c6e920b9e..b25baad295879ab49b05a66aa6deda3a423d5a8f 100644 (file)
--- a/source3/locking/posix.c
+++ b/source3/locking/posix.c
@@ -25,6 +25,7 @@
 #include "system/filesys.h"
 #include "locking/proto.h"
 #include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_rbt.h"
 #include "util_tdb.h"
 
 #undef DBGC_CLASS

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index a2c5e6905b1c5e50dd1f885adbe6086e760a9dce..a8d16a7162d325bab86bc85fee192e13afe7dae4 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -66,6 +66,7 @@
 #include "intl.h"
 #include "smb_signing.h"
 #include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_rbt.h"
 #include "smbldap.h"
 #include "../lib/util/bitmap.h"
 

diff --git a/source3/registry/reg_objects.c b/source3/registry/reg_objects.c
index 0add46065508a2a633edb5664453505be6f770aa..3e6ca67e804f4a394d4570ce9053264e594b9930 100644 (file)
--- a/source3/registry/reg_objects.c
+++ b/source3/registry/reg_objects.c
@@ -25,6 +25,7 @@
 #include "reg_objects.h"
 #include "util_tdb.h"
 #include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_rbt.h"
 #include "../libcli/registry/util_reg.h"
 
 #undef DBGC_CLASS

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index dacfa1979f485e750be17b9bf7f761e0317ca771..61d04dd36d6422a6a3f9242ac7118e15215a1ac3 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -30,6 +30,7 @@
 #include "nsswitch/winbind_client.h"
 #include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
+#include "dbwrap/dbwrap_rbt.h"
 #include "talloc_dict.h"
 #include "async_smb.h"
 #include "libsmb/libsmb.h"

diff --git a/source3/utils/net_idmap_check.c b/source3/utils/net_idmap_check.c
index 1f54121113088c86525e042816c029914769cad1..14f2f8d10facf62377a3a8d95d6aa80d815fa4a1 100644 (file)
--- a/source3/utils/net_idmap_check.c
+++ b/source3/utils/net_idmap_check.c
@@ -28,6 +28,7 @@
 #include "system/filesys.h"
 #include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
+#include "dbwrap/dbwrap_rbt.h"
 #include "net.h"
 #include "../libcli/security/dom_sid.h"
 #include "cbuf.h"