From 7a72c84ee74cb91fd9e98b1edc74e6b3c2ba1c36 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 16 Aug 2011 16:20:14 +0200 Subject: s3:dbwrap: move the db_open_rbt() prototype to a new header dbwrap_rbt.h --- source3/lib/dbwrap/dbwrap.h | 2 -- source3/lib/dbwrap/dbwrap_rbt.c | 1 + source3/lib/dbwrap/dbwrap_rbt.h | 29 +++++++++++++++++++++++++++++ source3/lib/talloc_dict.c | 1 + source3/libnet/libnet_dssync_passdb.c | 1 + source3/locking/posix.c | 1 + source3/param/loadparm.c | 1 + source3/registry/reg_objects.c | 1 + source3/torture/torture.c | 1 + source3/utils/net_idmap_check.c | 1 + 10 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 source3/lib/dbwrap/dbwrap_rbt.h diff --git a/source3/lib/dbwrap/dbwrap.h b/source3/lib/dbwrap/dbwrap.h index ab52783388..dbefe7bfd6 100644 --- 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 fa91d8cb95..699f922fa5 100644 --- 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 index 0000000000..1716879de6 --- /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 . +*/ + +#ifndef __DBWRAP_RBT_H__ +#define __DBWRAP_RBT_H__ + +#include + +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 3c5108d388..b7d4fe0dab 100644 --- 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 99a7b8019b..7ef73d722e 100644 --- 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 0e04105ef9..b25baad295 100644 --- 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 a2c5e6905b..a8d16a7162 100644 --- 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 0add460655..3e6ca67e80 100644 --- 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 dacfa1979f..61d04dd36d 100644 --- 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 1f54121113..14f2f8d10f 100644 --- 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" -- cgit