s4: remove unused dbwrap code

If we readd this later, we should share the code with
samba3 and make it async/non-blocking.

metze

8 files changed, 0 insertions, 561 deletions

diff --git a/source3/samba4.mk b/source3/samba4.mk
index a374e81084..c79694edb0 100644
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -90,7 +90,6 @@ nsswrappersrcdir := $(samba4srcdir)/../lib/nss_wrapper
 libstreamsrcdir := $(samba4srcdir)/lib/stream
 libutilsrcdir := $(samba4srcdir)/../lib/util
 libtdrsrcdir := $(samba4srcdir)/lib/tdr
-libdbwrapsrcdir := $(samba4srcdir)/lib/dbwrap
 libcryptosrcdir := $(samba4srcdir)/../lib/crypto
 libtorturesrcdir := ../lib/torture
 libcompressionsrcdir := $(samba4srcdir)/../lib/compression
diff --git a/source4/Makefile b/source4/Makefile
index fff2dbf544..7d4540ae6a 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -78,7 +78,6 @@ appwebsrcdir := lib/appweb
 libstreamsrcdir := lib/stream
 libutilsrcdir := ../lib/util
 libtdrsrcdir := lib/tdr
-libdbwrapsrcdir := lib/dbwrap
 libcryptosrcdir := ../lib/crypto
 libtorturesrcdir := ../lib/torture
 smb_serversrcdir := smb_server
diff --git a/source4/lib/dbwrap/config.mk b/source4/lib/dbwrap/config.mk
deleted file mode 100644
index 34e2629b16..0000000000
--- a/source4/lib/dbwrap/config.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-[SUBSYSTEM::LIBDBWRAP]
-PUBLIC_DEPENDENCIES = \
-		LIBTDB ctdb
-
-LIBDBWRAP_OBJ_FILES = $(addprefix $(libdbwrapsrcdir)/, dbwrap.o dbwrap_tdb.o dbwrap_ctdb.o)
-
diff --git a/source4/lib/dbwrap/dbwrap.c b/source4/lib/dbwrap/dbwrap.c
deleted file mode 100644
index 69203773f0..0000000000
--- a/source4/lib/dbwrap/dbwrap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   database wrapper code
-
-   Copyright (C) Andrew Tridgell 2007
-   Copyright (C) Volker Lendecke 2005
-   
-   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 "../tdb/include/tdb.h"
-#include "lib/dbwrap/dbwrap.h"
-#include "param/param.h"
-
-/**
-  open a temporary database
- */
-struct db_context *db_tmp_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *name, int tdb_flags)
-{
-	if (lp_parm_bool(lp_ctx, NULL, "ctdb", "enable", false) &&
-	    lp_parm_bool(lp_ctx, NULL, "ctdb", name, true)) {
-		    return db_tmp_open_ctdb(mem_ctx, lp_ctx, name, tdb_flags);
-	}
-
-	return db_tmp_open_tdb(mem_ctx, lp_ctx, name, tdb_flags);
-}
diff --git a/source4/lib/dbwrap/dbwrap.h b/source4/lib/dbwrap/dbwrap.h
deleted file mode 100644
index 1a3b3f5273..0000000000
--- a/source4/lib/dbwrap/dbwrap.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   database wrapper code
-
-   Copyright (C) Volker Lendecks 2005-2007
-   Copyright (C) Andrew Tridgell 2007
-   
-   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/>.
-*/
-
-struct db_record {
-	TDB_DATA key, value;
-	NTSTATUS (*store)(struct db_record *rec, TDB_DATA data, int flag);
-	NTSTATUS (*delete_rec)(struct db_record *rec);
-	void *private_data;
-};
-
-struct db_context {
-	struct db_record *(*fetch_locked)(struct db_context *db,
-					  TALLOC_CTX *mem_ctx,
-					  TDB_DATA key);
-	int (*fetch)(struct db_context *db, TALLOC_CTX *mem_ctx,
-		     TDB_DATA key, TDB_DATA *data);
-	int (*traverse)(struct db_context *db,
-			int (*f)(struct db_record *db,
-				 void *private_data),
-			void *private_data);
-	int (*traverse_read)(struct db_context *db,
-			     int (*f)(struct db_record *db,
-				      void *private_data),
-			     void *private_data);
-	int (*get_seqnum)(struct db_context *db);
-	void *private_data;
-};
-
-struct loadparm_context;
-struct db_context *db_tmp_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *name, int tdb_flags);
-
-
-/* backends */
-struct db_context *db_tmp_open_tdb(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *name, int tdb_flags);
-struct db_context *db_tmp_open_ctdb(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *name, int tdb_flags);
diff --git a/source4/lib/dbwrap/dbwrap_ctdb.c b/source4/lib/dbwrap/dbwrap_ctdb.c
deleted file mode 100644
index b079658a00..0000000000
--- a/source4/lib/dbwrap/dbwrap_ctdb.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   Database interface wrapper around ctdbd
-
-   Copyright (C) Andrew Tridgell 2007
-   
-   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 "../tdb/include/tdb.h"
-#include "lib/dbwrap/dbwrap.h"
-#include "cluster/cluster.h"
-#include "cluster/ctdb/include/ctdb.h"
-
-static NTSTATUS db_ctdb_store(struct db_record *rec, TDB_DATA data, int flag)
-{
-	struct ctdb_record_handle *h = talloc_get_type(rec->private_data, struct ctdb_record_handle);
-	int ret;
-
-	ret = ctdb_record_store(h, data);
-	if (ret != 0) {
-		return NT_STATUS_INTERNAL_DB_CORRUPTION;
-	}
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS db_ctdb_delete(struct db_record *rec)
-{
-	return rec->store(rec, tdb_null, TDB_REPLACE);
-}
-
-
-static struct db_record *db_ctdb_fetch_locked(struct db_context *db,
-					      TALLOC_CTX *mem_ctx,
-					      TDB_DATA key)
-{
-	struct db_record *rec;
-	struct ctdb_record_handle *h;
-	struct ctdb_db_context *cdb = talloc_get_type(db->private_data, struct ctdb_db_context);
-
-	rec = talloc(mem_ctx, struct db_record);
-	if (!rec) return NULL;
-
-	h = ctdb_fetch_lock(cdb, rec, key, &rec->value);
-	if (h == NULL) {
-		talloc_free(rec);
-		return NULL;
-	}
-
-	rec->private_data = h;
-	rec->store        = db_ctdb_store;
-	rec->delete_rec   = db_ctdb_delete;
-
-	return rec;
-}
-
-/*
-  fetch (unlocked, no migration) operation on ctdb
- */
-static int db_ctdb_fetch(struct db_context *db, TALLOC_CTX *mem_ctx,
-			 TDB_DATA key, TDB_DATA *data)
-{
-	struct ctdb_db_context *cdb = talloc_get_type(db->private_data, struct ctdb_db_context);
-
-	return ctdb_fetch(cdb, mem_ctx, key, data);
-}
-
-struct traverse_state {
-	struct db_context *db;
-	int (*fn)(struct db_record *rec, void *private_data);
-	void *private_data;
-};
-
-static int traverse_callback(struct ctdb_context *ctdb, TDB_DATA key, TDB_DATA data, void *private_data)
-{
-	struct traverse_state *state = (struct traverse_state *)private_data;
-	struct db_record *rec;
-	TALLOC_CTX *tmp_ctx = talloc_new(state->db);
-	/* we have to give them a locked record to prevent races */
-	rec = db_ctdb_fetch_locked(state->db, tmp_ctx, key);
-	if (rec && rec->value.dsize > 0) {
-		state->fn(rec, state->private_data);
-	}
-	talloc_free(tmp_ctx);
-	return 0;
-}
-
-static int db_ctdb_traverse(struct db_context *db,
-			    int (*fn)(struct db_record *rec, void *private_data),
-			    void *private_data)
-{
-	struct ctdb_db_context *cdb = talloc_get_type(db->private_data, struct ctdb_db_context);
-	struct traverse_state state;
-
-	state.db = db;
-	state.fn = fn;
-	state.private_data = private_data;
-
-	ctdb_traverse(cdb, traverse_callback, &state);
-	return 0;
-}
-
-static NTSTATUS db_ctdb_store_deny(struct db_record *rec, TDB_DATA data, int flag)
-{
-	return NT_STATUS_MEDIA_WRITE_PROTECTED;
-}
-
-static NTSTATUS db_ctdb_delete_deny(struct db_record *rec)
-{
-	return NT_STATUS_MEDIA_WRITE_PROTECTED;
-}
-
-static int traverse_read_callback(struct ctdb_context *ctdb, 
-				  TDB_DATA key, TDB_DATA data, void *private_data)
-{
-	struct traverse_state *state = (struct traverse_state *)private_data;
-	struct db_record rec;
-	rec.key = key;
-	rec.value = data;
-	rec.store = db_ctdb_store_deny;
-	rec.delete_rec = db_ctdb_delete_deny;
-	rec.private_data = state->db;
-	state->fn(&rec, state->private_data);
-	return 0;
-}
-
-static int db_ctdb_traverse_read(struct db_context *db,
-				 int (*fn)(struct db_record *rec,
-					   void *private_data),
-				 void *private_data)
-{
-	struct traverse_state state;
-	struct ctdb_db_context *cdb = talloc_get_type(db->private_data, struct ctdb_db_context);
-
-	state.db = db;
-	state.fn = fn;
-	state.private_data = private_data;
-
-	ctdb_traverse(cdb, traverse_read_callback, &state);
-	return 0;
-}
-
-static int db_ctdb_get_seqnum(struct db_context *db)
-{
-	DEBUG(0,("ctdb_get_seqnum not implemented\n"));
-	return -1;
-}
-
-struct db_context *db_tmp_open_ctdb(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
-				    const char *name, int tdb_flags)
-{
-	struct db_context *db;
-	struct ctdb_context *ctdb = talloc_get_type(cluster_backend_handle(), 
-						    struct ctdb_context);
-	struct ctdb_db_context *cdb;
-
-	db = talloc_zero(mem_ctx, struct db_context);
-	if (db == NULL) {
-		return NULL;
-	}
-
-	cdb = ctdb_attach(ctdb, name);
-	if (!cdb) {
-		DEBUG(0,("Failed to attach to ctdb database '%s'\n", name));
-		talloc_free(db);
-		return NULL;
-	}
-
-	db->private_data  = cdb;
-	db->fetch_locked  = db_ctdb_fetch_locked;
-	db->fetch         = db_ctdb_fetch;
-	db->traverse      = db_ctdb_traverse;
-	db->traverse_read = db_ctdb_traverse_read;
-	db->get_seqnum    = db_ctdb_get_seqnum;
-
-	DEBUG(3,("db_tmp_open_ctdb: opened database '%s'\n", name));
-
-	return db;
-}
diff --git a/source4/lib/dbwrap/dbwrap_tdb.c b/source4/lib/dbwrap/dbwrap_tdb.c
deleted file mode 100644
index 3fd13dbd13..0000000000
--- a/source4/lib/dbwrap/dbwrap_tdb.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-
-   Database interface wrapper around tdb
-
-   Copyright (C) Volker Lendecke 2005
-   Copyright (C) Andrew Tridgell 2007
-   
-   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 "../tdb/include/tdb.h"
-#include "lib/dbwrap/dbwrap.h"
-#include "system/filesys.h"
-#include "tdb_wrap.h"
-#include "param/param.h"
-
-struct db_tdb_ctx {
-	struct tdb_wrap *wtdb;
-};
-
-static NTSTATUS db_tdb_store(struct db_record *rec, TDB_DATA data, int flag);
-static NTSTATUS db_tdb_delete(struct db_record *rec);
-
-static int db_tdb_record_destr(struct db_record* data)
-{
-	struct db_tdb_ctx *ctx = talloc_get_type(data->private_data, struct db_tdb_ctx);
-
-	if (tdb_chainunlock(ctx->wtdb->tdb, data->key) != 0) {
-		DEBUG(0, ("tdb_chainunlock failed\n"));
-		return -1;
-	}
-	return 0;
-}
-
-static int db_tdb_fetch(struct db_context *db, TALLOC_CTX *mem_ctx, TDB_DATA key, TDB_DATA *data)
-{
-	struct db_tdb_ctx *ctx = talloc_get_type(db->private_data, struct db_tdb_ctx);
-	TDB_DATA value;
-
-	value = tdb_fetch(ctx->wtdb->tdb, key);
-	if (value.dptr == NULL) {
-		return -1;
-	}
-
-	data->dsize = value.dsize;
-	data->dptr  = (uint8_t *)talloc_memdup(mem_ctx, value.dptr, value.dsize);
-	free(value.dptr);
-	if (data->dptr == NULL) {
-		errno = ENOMEM;
-		return -1;
-	}
-
-	return 0;
-}
-
-static struct db_record *db_tdb_fetch_locked(struct db_context *db,
-				     TALLOC_CTX *mem_ctx, TDB_DATA key)
-{
-	struct db_tdb_ctx *ctx = talloc_get_type(db->private_data, struct db_tdb_ctx);
-	struct db_record *result;
-	TDB_DATA value;
-
-	result = talloc(mem_ctx, struct db_record);
-	if (result == NULL) {
-		return NULL;
-	}
-
-	result->key.dsize = key.dsize;
-	result->key.dptr = (uint8_t *)talloc_memdup(result, key.dptr, key.dsize);
-	if (result->key.dptr == NULL) {
-		talloc_free(result);
-		return NULL;
-	}
-
-	result->value.dptr = NULL;
-	result->value.dsize = 0;
-	result->private_data = talloc_reference(result, ctx);
-	result->store = db_tdb_store;
-	result->delete_rec = db_tdb_delete;
-
-	if (tdb_chainlock(ctx->wtdb->tdb, key) != 0) {
-		talloc_free(result);
-		return NULL;
-	}
-
-	talloc_set_destructor(result, db_tdb_record_destr);
-
-	value = tdb_fetch(ctx->wtdb->tdb, key);
-
-	if (value.dptr == NULL) {
-		return result;
-	}
-
-	result->value.dsize = value.dsize;
-	result->value.dptr = (uint8_t *)talloc_memdup(result, value.dptr,
-						    value.dsize);
-	free(value.dptr);
-	if (result->value.dptr == NULL) {
-		talloc_free(result);
-		return NULL;
-	}
-
-	return result;
-}
-
-static NTSTATUS db_tdb_store(struct db_record *rec, TDB_DATA data, int flag)
-{
-	struct db_tdb_ctx *ctx = talloc_get_type(rec->private_data, struct db_tdb_ctx);
-
-	/*
-	 * This has a bug: We need to replace rec->value for correct
-	 * operation, but right now brlock and locking don't use the value
-	 * anymore after it was stored.
-	 */
-
-	return (tdb_store(ctx->wtdb->tdb, rec->key, data, flag) == 0) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-static NTSTATUS db_tdb_delete(struct db_record *rec)
-{
-	struct db_tdb_ctx *ctx = talloc_get_type(rec->private_data, struct db_tdb_ctx);
-
-	return (tdb_delete(ctx->wtdb->tdb, rec->key) == 0) ?
-		NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
-
-struct db_tdb_traverse_ctx {
-	struct db_context *db;
-	int (*f)(struct db_record *rec, void *private_data);
-	void *private_data;
-};
-
-static int db_tdb_traverse_func(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
-				void *private_data)
-{
-	struct db_tdb_traverse_ctx *ctx =
-		(struct db_tdb_traverse_ctx *)private_data;
-	struct db_record rec;
-
-	rec.key = kbuf;
-	rec.value = dbuf;
-	rec.store = db_tdb_store;
-	rec.delete_rec = db_tdb_delete;
-	rec.private_data = ctx->db->private_data;
-
-	return ctx->f(&rec, ctx->private_data);
-}
-
-static int db_tdb_traverse(struct db_context *db,
-			   int (*f)(struct db_record *rec, void *private_data),
-			   void *private_data)
-{
-	struct db_tdb_ctx *db_ctx =
-		talloc_get_type(db->private_data, struct db_tdb_ctx);
-	struct db_tdb_traverse_ctx ctx;
-
-	ctx.db = db;
-	ctx.f = f;
-	ctx.private_data = private_data;
-	return tdb_traverse(db_ctx->wtdb->tdb, db_tdb_traverse_func, &ctx);
-}
-
-static NTSTATUS db_tdb_store_deny(struct db_record *rec, TDB_DATA data, int flag)
-{
-	return NT_STATUS_MEDIA_WRITE_PROTECTED;
-}
-
-static NTSTATUS db_tdb_delete_deny(struct db_record *rec)
-{
-	return NT_STATUS_MEDIA_WRITE_PROTECTED;
-}
-
-static int db_tdb_traverse_read_func(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
-				void *private_data)
-{
-	struct db_tdb_traverse_ctx *ctx =
-		(struct db_tdb_traverse_ctx *)private_data;
-	struct db_record rec;
-
-	rec.key = kbuf;
-	rec.value = dbuf;
-	rec.store = db_tdb_store_deny;
-	rec.delete_rec = db_tdb_delete_deny;
-	rec.private_data = ctx->db->private_data;
-
-	return ctx->f(&rec, ctx->private_data);
-}
-
-static int db_tdb_traverse_read(struct db_context *db,
-			   int (*f)(struct db_record *rec, void *private_data),
-			   void *private_data)
-{
-	struct db_tdb_ctx *db_ctx =
-		talloc_get_type(db->private_data, struct db_tdb_ctx);
-	struct db_tdb_traverse_ctx ctx;
-
-	ctx.db = db;
-	ctx.f = f;
-	ctx.private_data = private_data;
-	return tdb_traverse_read(db_ctx->wtdb->tdb, db_tdb_traverse_read_func, &ctx);
-}
-
-static int db_tdb_get_seqnum(struct db_context *db)
-
-{
-	struct db_tdb_ctx *db_ctx =
-		talloc_get_type(db->private_data, struct db_tdb_ctx);
-	return tdb_get_seqnum(db_ctx->wtdb->tdb);
-}
-
-/*
-  open a temporary database
- */
-struct db_context *db_tmp_open_tdb(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, 
-				   const char *name, int tdb_flags)
-{
-	struct db_context *result;
-	struct db_tdb_ctx *db_tdb;
-	char *path;
-
-	result = talloc_zero(mem_ctx, struct db_context);
-	if (result == NULL) goto failed;
-
-	db_tdb = talloc(result, struct db_tdb_ctx);
-	if (db_tdb == NULL) goto failed;
-
-	result->private_data = db_tdb;
-
-	/* the name passed in should not be a full path, it should be
-	   just be the db name */
-	path = smbd_tmp_path(result, lp_ctx, name);
-
-	db_tdb->wtdb = tdb_wrap_open(db_tdb, path, 0, tdb_flags,
-				     O_CREAT|O_RDWR, 0666);
-	if (db_tdb->wtdb == NULL) {
-		DEBUG(3, ("Could not open tdb '%s': %s\n", path, strerror(errno)));
-		goto failed;
-	}
-	
-	talloc_free(path);
-
-	result->fetch_locked  = db_tdb_fetch_locked;
-	result->fetch         = db_tdb_fetch;
-	result->traverse      = db_tdb_traverse;
-	result->traverse_read = db_tdb_traverse_read;
-	result->get_seqnum    = db_tdb_get_seqnum;
-
-	return result;
-
- failed:
-	talloc_free(result);
-	return NULL;
-}
diff --git a/source4/main.mk b/source4/main.mk
index 1d4ffc5d44..fa87530512 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -21,7 +21,6 @@ mkinclude ../lib/nss_wrapper/config.mk
 mkinclude lib/stream/config.mk
 mkinclude ../lib/util/config.mk
 mkinclude lib/tdr/config.mk
-mkinclude lib/dbwrap/config.mk
 mkinclude ../lib/crypto/config.mk
 mkinclude ../lib/torture/config.mk
 mkinclude lib/basic.mk