summaryrefslogtreecommitdiff
path: root/source3/lib/dbwrap
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-08-16 15:51:58 +0200
committerMichael Adam <obnox@samba.org>2011-10-11 14:17:54 +0200
commit82bc3fa81cc1037e004b94dde7050efc50722294 (patch)
tree472d105768fb80e7d6a378a0844e8ec120857f56 /source3/lib/dbwrap
parentb3b69064d32c921c010b60d12551d450ed4be7c9 (diff)
downloadsamba-82bc3fa81cc1037e004b94dde7050efc50722294.tar.gz
samba-82bc3fa81cc1037e004b94dde7050efc50722294.tar.bz2
samba-82bc3fa81cc1037e004b94dde7050efc50722294.zip
s3:dbwrap: move the db_open_ctdb() prototype to a new header dbwrap_ctdb.h
Diffstat (limited to 'source3/lib/dbwrap')
-rw-r--r--source3/lib/dbwrap/dbwrap.h7
-rw-r--r--source3/lib/dbwrap/dbwrap_ctdb.c1
-rw-r--r--source3/lib/dbwrap/dbwrap_ctdb.h36
-rw-r--r--source3/lib/dbwrap/dbwrap_open.c1
4 files changed, 38 insertions, 7 deletions
diff --git a/source3/lib/dbwrap/dbwrap.h b/source3/lib/dbwrap/dbwrap.h
index 9084f87d30..e2a291ec8e 100644
--- a/source3/lib/dbwrap/dbwrap.h
+++ b/source3/lib/dbwrap/dbwrap.h
@@ -65,13 +65,6 @@ struct db_context *db_open_tdb(TALLOC_CTX *mem_ctx,
struct messaging_context;
-#ifdef CLUSTER_SUPPORT
-struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
- const char *name,
- int hash_size, int tdb_flags,
- int open_flags, mode_t mode);
-#endif
-
struct db_context *db_open_file(TALLOC_CTX *mem_ctx,
struct messaging_context *msg_ctx,
const char *name,
diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 84d7b2fc2f..2263d73dec 100644
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -46,6 +46,7 @@
#include "ctdb_private.h"
#include "ctdbd_conn.h"
#include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_ctdb.h"
#include "g_lock.h"
#include "messages.h"
diff --git a/source3/lib/dbwrap/dbwrap_ctdb.h b/source3/lib/dbwrap/dbwrap_ctdb.h
new file mode 100644
index 0000000000..13ce140489
--- /dev/null
+++ b/source3/lib/dbwrap/dbwrap_ctdb.h
@@ -0,0 +1,36 @@
+/*
+ Unix SMB/CIFS implementation.
+ Database interface wrapper around ctdbd
+ Copyright (C) Volker Lendecke 2007-2009
+ Copyright (C) Michael Adam 2009
+
+ 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_CTDB_H__
+#define __DBWRAP_CTDB_H__
+
+#ifdef CLUSTER_SUPPORT
+
+#include <talloc.h>
+
+struct db_context;
+
+struct db_context *db_open_ctdb(TALLOC_CTX *mem_ctx,
+ const char *name,
+ int hash_size, int tdb_flags,
+ int open_flags, mode_t mode);
+#endif /* CLUSTER_SUPPORT */
+
+#endif /* __DBWRAP_CTDB_H__ */
diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c
index a5e15e305a..c8265cf15f 100644
--- a/source3/lib/dbwrap/dbwrap_open.c
+++ b/source3/lib/dbwrap/dbwrap_open.c
@@ -22,6 +22,7 @@
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_private.h"
#include "dbwrap/dbwrap_open.h"
+#include "dbwrap/dbwrap_ctdb.h"
#include "util_tdb.h"
#ifdef CLUSTER_SUPPORT
#include "ctdb_private.h"