r19428: moved tdbutil.c from lib/tdb/common/ to lib/util/util_tdb.c

tdbutil.c is Samba specific, so should not be part of the generic tdb
library
(This used to be commit 979dd24f5e44605fc1603b690913b8c31be7478f)

18 files changed, 37 insertions, 76 deletions

diff --git a/source4/lib/gencache/gencache.c b/source4/lib/gencache/gencache.c
index 4c60d76095..dff67054d4 100644
--- a/source4/lib/gencache/gencache.c
+++ b/source4/lib/gencache/gencache.c
@@ -22,7 +22,6 @@
 */
 
 #include "includes.h"
-#include "lib/tdb/include/tdbutil.h"
 #include "system/time.h"
 #include "system/filesys.h"
 #include "db_wrap.h"
diff --git a/source4/lib/messaging/config.mk b/source4/lib/messaging/config.mk
index 5a0cc4c18f..186f54ba74 100644
--- a/source4/lib/messaging/config.mk
+++ b/source4/lib/messaging/config.mk
@@ -7,6 +7,7 @@ OBJ_FILES = \
 PUBLIC_DEPENDENCIES = \
 		DB_WRAP \
 		NDR_IRPC \
-		UNIX_PRIVS
+		UNIX_PRIVS \
+		UTIL_TDB 
 # End SUBSYSTEM MESSAGING
 ################################################
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index 00b33017d8..09e04fda9b 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -29,9 +29,10 @@
 #include "librpc/gen_ndr/ndr_irpc.h"
 #include "lib/messaging/irpc.h"
 #include "db_wrap.h"
-#include "lib/tdb/include/tdbutil.h"
 #include "lib/util/unix_privs.h"
 #include "librpc/rpc/dcerpc.h"
+#include "lib/tdb/include/tdb.h"
+#include "lib/util/util_tdb.h"
 
 /* change the message version with any incompatible changes in the protocol */
 #define MESSAGING_VERSION 1
diff --git a/source4/lib/samba3/group.c b/source4/lib/samba3/group.c
index fcf015de68..44d8775e42 100644
--- a/source4/lib/samba3/group.c
+++ b/source4/lib/samba3/group.c
@@ -21,7 +21,8 @@
 
 #include "includes.h"
 #include "lib/samba3/samba3.h"
-#include "lib/tdb/include/tdbutil.h"
+#include "lib/tdb/include/tdb.h"
+#include "lib/util/util_tdb.h"
 #include "system/filesys.h"
 #include "libcli/security/security.h"
 
diff --git a/source4/lib/samba3/idmap.c b/source4/lib/samba3/idmap.c
index 334accc2aa..c5c771cdd3 100644
--- a/source4/lib/samba3/idmap.c
+++ b/source4/lib/samba3/idmap.c
@@ -24,7 +24,8 @@
 */
 
 #include "includes.h"
-#include "lib/tdb/include/tdbutil.h"
+#include "lib/tdb/include/tdb.h"
+#include "lib/util/util_tdb.h"
 #include "lib/samba3/samba3.h"
 #include "system/filesys.h"
 #include "libcli/security/security.h"
diff --git a/source4/lib/samba3/policy.c b/source4/lib/samba3/policy.c
index cfe6284fc4..936a16bca8 100644
--- a/source4/lib/samba3/policy.c
+++ b/source4/lib/samba3/policy.c
@@ -19,7 +19,8 @@
  */
 
 #include "includes.h"
-#include "lib/tdb/include/tdbutil.h"
+#include "lib/tdb/include/tdb.h"
+#include "lib/util/util_tdb.h"
 #include "lib/samba3/samba3.h"
 #include "system/filesys.h"
 
diff --git a/source4/lib/samba3/registry.c b/source4/lib/samba3/registry.c
index 7f68c9df74..05855b6583 100644
--- a/source4/lib/samba3/registry.c
+++ b/source4/lib/samba3/registry.c
@@ -24,7 +24,8 @@
 #include "includes.h"
 #include "lib/samba3/samba3.h"
 #include "librpc/gen_ndr/winreg.h"
-#include "lib/tdb/include/tdbutil.h"
+#include "lib/tdb/include/tdb.h"
+#include "lib/util/util_tdb.h"
 #include "system/filesys.h"
 #include "pstring.h"
 
diff --git a/source4/lib/samba3/secrets.c b/source4/lib/samba3/secrets.c
index 479fedbc28..f838b06154 100644
--- a/source4/lib/samba3/secrets.c
+++ b/source4/lib/samba3/secrets.c
@@ -26,10 +26,10 @@
 
 #include "includes.h"
 #include "lib/tdb/include/tdb.h"
+#include "lib/util/util_tdb.h"
 #include "lib/samba3/samba3.h"
 #include "system/filesys.h"
 #include "librpc/gen_ndr/security.h"
-#include "lib/tdb/include/tdbutil.h"
 #include "auth/credentials/credentials.h"
 
 /**
diff --git a/source4/lib/samba3/share_info.c b/source4/lib/samba3/share_info.c
index 318e0ff01f..464dcc38e3 100644
--- a/source4/lib/samba3/share_info.c
+++ b/source4/lib/samba3/share_info.c
@@ -23,7 +23,8 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "lib/tdb/include/tdbutil.h"
+#include "lib/tdb/include/tdb.h"
+#include "lib/util/util_tdb.h"
 #include "lib/samba3/samba3.h"
 #include "system/filesys.h"
 
diff --git a/source4/lib/samba3/tdbsam.c b/source4/lib/samba3/tdbsam.c
index 148a3c90f5..0d4854a270 100644
--- a/source4/lib/samba3/tdbsam.c
+++ b/source4/lib/samba3/tdbsam.c
@@ -22,7 +22,8 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "lib/tdb/include/tdbutil.h"
+#include "lib/tdb/include/tdb.h"
+#include "lib/util/util_tdb.h"
 #include "lib/samba3/samba3.h"
 
 #define TDB_FORMAT_STRING_V0       "ddddddBBBBBBBBBBBBddBBwdwdBwwd"
diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk
index c5d1a33990..0162b78381 100644
--- a/source4/lib/tdb/config.mk
+++ b/source4/lib/tdb/config.mk
@@ -7,7 +7,7 @@ DESCRIPTION = Trivial Database Library
 OBJ_FILES = \
 	common/tdb.o common/dump.o common/io.o common/lock.o \
 	common/open.o common/traverse.o common/freelist.o \
-	common/error.o common/transaction.o common/tdbutil.o
+	common/error.o common/transaction.o
 CFLAGS = -Ilib/tdb/include
 PUBLIC_HEADERS = include/tdb.h
 #
diff --git a/source4/lib/tdb/include/tdbutil.h b/source4/lib/tdb/include/tdbutil.h
deleted file mode 100644
index 26747373f4..0000000000
--- a/source4/lib/tdb/include/tdbutil.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   tdb utility functions
-   Copyright (C) Andrew Tridgell 1999
-   
-   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 2 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, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifndef __TDBUTIL_H__
-#define __TDBUTIL_H__
-
-#include "tdb.h"
-
-/* single node of a list returned by tdb_search_keys */
-typedef struct keys_node 
-{
-	struct keys_node *prev, *next;
-	TDB_DATA node_key;
-} TDB_LIST_NODE;
-
-
-TDB_LIST_NODE *tdb_search_keys(struct tdb_context*, const char*);
-void tdb_search_list_free(TDB_LIST_NODE*);
-int32_t tdb_change_int32_atomic(struct tdb_context *tdb, const char *keystr, int32_t *oldval, int32_t change_val);
-int tdb_lock_bystring(struct tdb_context *tdb, const char *keyval);
-void tdb_unlock_bystring(struct tdb_context *tdb, const char *keyval);
-int32_t tdb_fetch_int32(struct tdb_context *tdb, const char *keystr);
-BOOL tdb_store_uint32(struct tdb_context *tdb, const char *keystr, uint32_t value);
-int tdb_store_int32(struct tdb_context *tdb, const char *keystr, int32_t v);
-BOOL tdb_fetch_uint32(struct tdb_context *tdb, const char *keystr, uint32_t *value);
-int tdb_traverse_delete_fn(struct tdb_context *the_tdb, TDB_DATA key, TDB_DATA dbuf,
-                     void *state);
-int tdb_store_bystring(struct tdb_context *tdb, const char *keystr, TDB_DATA data, int flags);
-TDB_DATA tdb_fetch_bystring(struct tdb_context *tdb, const char *keystr);
-int tdb_delete_bystring(struct tdb_context *tdb, const char *keystr);
-int tdb_unpack(struct tdb_context *tdb, char *buf, int bufsize, const char *fmt, ...);
-size_t tdb_pack(struct tdb_context *tdb, char *buf, int bufsize, const char *fmt, ...);
-
-#endif /* __TDBUTIL_H__ */
diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index 401b4df005..5e49eb839a 100644
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -49,3 +49,13 @@ 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
+################################################
diff --git a/source4/lib/tdb/common/tdbutil.c b/source4/lib/util/util_tdb.c
index 1cf1eb8842..820fc2dbb1 100644
--- a/source4/lib/tdb/common/tdbutil.c
+++ b/source4/lib/util/util_tdb.c
@@ -3,7 +3,7 @@
 
    tdb utility functions
 
-   Copyright (C) Andrew Tridgell 1992-2005
+   Copyright (C) Andrew Tridgell 1992-2006
    
    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
@@ -19,17 +19,9 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-/*
-  NOTE: these utility functions are specific to Samba, and are not part
-  of the core tdb code
-*/
 
 #include "includes.h"
-#include "lib/tdb/include/tdbutil.h"
-#include "system/glob.h"
-#include "system/wait.h"
-#include "system/filesys.h"
-#include "lib/util/dlinklist.h"
+#include "lib/tdb/include/tdb.h"
 #include "pstring.h"
 
 /* these are little tdb utility functions that are meant to make
diff --git a/source4/ntvfs/common/notify.c b/source4/ntvfs/common/notify.c
index 17c6e81c6f..19a60a51a9 100644
--- a/source4/ntvfs/common/notify.c
+++ b/source4/ntvfs/common/notify.c
@@ -27,7 +27,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "lib/tdb/include/tdb.h"
-#include "lib/tdb/include/tdbutil.h"
+#include "lib/util/util_tdb.h"
 #include "messaging/messaging.h"
 #include "db_wrap.h"
 #include "lib/messaging/irpc.h"
diff --git a/source4/passdb/config.mk b/source4/passdb/config.mk
index 51e2c4a83e..81897323c9 100644
--- a/source4/passdb/config.mk
+++ b/source4/passdb/config.mk
@@ -1,4 +1,5 @@
 [SUBSYSTEM::SECRETS]
 PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = secrets.o
-PRIVATE_DEPENDENCIES = DB_WRAP
+PRIVATE_DEPENDENCIES = DB_WRAP UTIL_TDB
+
diff --git a/source4/passdb/secrets.c b/source4/passdb/secrets.c
index 7171fa11ab..876be607f1 100644
--- a/source4/passdb/secrets.c
+++ b/source4/passdb/secrets.c
@@ -23,12 +23,13 @@
    such as the local SID and machine trust password */
 
 #include "includes.h"
-#include "lib/tdb/include/tdbutil.h"
 #include "secrets.h"
 #include "param/param.h"
 #include "system/filesys.h"
 #include "db_wrap.h"
 #include "lib/ldb/include/ldb.h"
+#include "lib/tdb/include/tdb.h"
+#include "lib/util/util_tdb.h"
 #include "dsdb/samdb/samdb.h"
 
 static struct tdb_wrap *tdb;
diff --git a/source4/torture/basic/mangle_test.c b/source4/torture/basic/mangle_test.c
index 091e471e8a..68ee0b63f5 100644
--- a/source4/torture/basic/mangle_test.c
+++ b/source4/torture/basic/mangle_test.c
@@ -22,7 +22,8 @@
 #include "torture/torture.h"
 #include "system/filesys.h"
 #include "system/dir.h"
-#include "lib/tdb/include/tdbutil.h"
+#include "lib/tdb/include/tdb.h"
+#include "lib/util/util_tdb.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
 #include "pstring.h"