lib: Remove tdb_compat

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py
index cd7093cd9ed82f27050e95d201a47cca4e97911f..fa75e2261d824d5363b28f95768fe7ef19ea6f92 100644 (file)
--- a/.ycm_extra_conf.py
+++ b/.ycm_extra_conf.py
@@ -74,7 +74,6 @@ flags = [
 '-Ilib/talloc',
 '-Ilib/tdb',
 '-Ilib/tdb/include',
-'-Ilib/tdb_compat',
 '-Ilib/tevent',
 '-Ilib/tsocket',
 '-Ilib/util/charset',

diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py
index ffe678416edfb457a92b200530c9b3c2bc7193e0..6d06fd929a1ca7aa8b2c375774c251a924f3a737 100644 (file)
--- a/buildtools/wafsamba/samba3.py
+++ b/buildtools/wafsamba/samba3.py
@@ -62,7 +62,7 @@ def s3_fix_kwargs(bld, kwargs):
     s3reldir = os_path_relpath(s3dir, bld.curdir)
 
     # the extra_includes list is relative to the source3 directory
-    extra_includes = [ '.', 'include', 'lib', '../lib/tdb_compat' ]
+    extra_includes = [ '.', 'include', 'lib' ]
     # local heimdal paths only included when USING_SYSTEM_KRB5 is not set
     if not bld.CONFIG_SET("USING_SYSTEM_KRB5"):
         extra_includes += [ '../source4/heimdal/lib/com_err',

diff --git a/lib/tdb_compat/tdb_compat.c b/lib/tdb_compat/tdb_compat.c
deleted file mode 100644 (file)
index 32a142d..0000000
--- a/lib/tdb_compat/tdb_compat.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <tdb_compat.h>
-

diff --git a/lib/tdb_compat/tdb_compat.h b/lib/tdb_compat/tdb_compat.h
deleted file mode 100644 (file)
index da2e1dc..0000000
--- a/lib/tdb_compat/tdb_compat.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-
-   Compatibility layer for TDB1 vs TDB2.
-
-   Copyright (C) Rusty Russell 2011
-
-     ** NOTE! The following LGPL license applies to the tdb_compat
-     ** library. This does NOT imply that all of Samba is released
-     ** under the LGPL
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 3 of the License, or (at your option) any later version.
-
-   This library 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
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, see <http://www.gnu.org/licenses/>.
-*/
-#ifndef TDB_COMPAT_H
-#define TDB_COMPAT_H
-
-#include "replace.h"
-#include <ccan/typesafe_cb/typesafe_cb.h>
-#include <tdb.h>
-
-#endif /* TDB_COMPAT_H */

diff --git a/lib/tdb_compat/wscript b/lib/tdb_compat/wscript
deleted file mode 100644 (file)
index 2eac1e9..0000000
--- a/lib/tdb_compat/wscript
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env python
-
-import Options
-
-def set_options(opt):
-    opt.RECURSE('lib/tdb')
-
-def configure(conf):
-    conf.RECURSE('lib/tdb')
-
-def build(bld):
-    bld.RECURSE('lib/tdb')
-    bld.SAMBA_LIBRARY('tdb_compat',
-                      source='tdb_compat.c',
-                     deps='replace tdb',
-                      private_library=True)

diff --git a/source3/.clang_complete b/source3/.clang_complete
index f387318ff0840b2ad8cdec42dd0b468b0ab84e0d..789837308f8d391491cf1c4fa31c281a35d976f6 100644 (file)
--- a/source3/.clang_complete
+++ b/source3/.clang_complete
@@ -6,7 +6,6 @@
 -I./../lib/tevent
 -I./../lib/popt
 -I./../lib/tdb/include
--I./../lib/tdb_compat
 -I./include/autoconf
 -I./include
 -I./librpc

diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index ec4c11dd43aa655b5515987f9e0127e013bea3cb..fff0f42eccfa150cfe480abb7402c84ddd0d5a3b 100644 (file)
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -26,7 +26,7 @@
 #include "groupdb/mapping.h"
 #include "../libcli/security/security.h"
 #include "lib/winbind_util.h"
-#include "tdb_compat.h"
+#include <tdb.h>
 #include "groupdb/mapping_tdb.h"
 
 static const struct mapping_backend *backend;

diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h
index 49445d91b2e62604c9e330f334ff764f4adea138..36932bdaf545a813c46ebc8e79d13ae8e4fd54ca 100644 (file)
--- a/source3/include/ctdbd_conn.h
+++ b/source3/include/ctdbd_conn.h
@@ -20,7 +20,7 @@
 #ifndef _CTDBD_CONN_H
 #define _CTDBD_CONN_H
 
-#include "tdb_compat.h"
+#include <tdb.h>
 
 struct ctdbd_connection;
 struct messaging_context;

diff --git a/source3/include/printing.h b/source3/include/printing.h
index 563659a693e928175670d64fb79d9439a0b5790f..8dd3d268115e2e58b80cafa6a81d4b35405680c7 100644 (file)
--- a/source3/include/printing.h
+++ b/source3/include/printing.h
@@ -24,7 +24,7 @@
    This file defines the low-level printing system interfaces used by the
    SAMBA printing subsystem.
 */
-#include "tdb_compat.h"
+#include <tdb.h>
 #include "lib/param/loadparm.h"
 
 /* Extra fields above "LPQ_PRINTING" are used to map extra NT status codes. */

diff --git a/source3/include/util_tdb.h b/source3/include/util_tdb.h
index 5a58a6b67b7952aea27688d43a469480292d29b4..13bdeab3784eb1ba0305c7fc6696e11263c98ab1 100644 (file)
--- a/source3/include/util_tdb.h
+++ b/source3/include/util_tdb.h
@@ -20,7 +20,7 @@
 #ifndef __TDBUTIL_H__
 #define __TDBUTIL_H__
 
-#include "tdb_compat.h"
+#include <tdb.h>
 
 #include <talloc.h> /* for tdb_wrap_open() */
 #include "../libcli/util/ntstatus.h" /* for map_nt_error_from_tdb() */

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 18b877c23534660b2e90f279b8ba291da23123b3..85717dd0dccc4a03c0adce2deeaeaff2cd4836dc 100644 (file)
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -27,24 +27,6 @@
 
 #include "messages.h"
 
-/*
- * It is not possible to include ctdb.h and tdb_compat.h (included via
- * some other include above) without warnings. This fixes those
- * warnings.
- */
-
-#ifdef typesafe_cb
-#undef typesafe_cb
-#endif
-
-#ifdef typesafe_cb_preargs
-#undef typesafe_cb_preargs
-#endif
-
-#ifdef typesafe_cb_postargs
-#undef typesafe_cb_postargs
-#endif
-
 /* paths to these include files come from --with-ctdb= in configure */
 
 #include "ctdb.h"

diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index 947a888982d56c6fd35e690af060b3efe68d28f9..f37bfd82596695fecccb36269d36ccd0df1dcb2f 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -27,24 +27,6 @@
 #include "dbwrap/dbwrap_rbt.h"
 #include "lib/param/param.h"
 
-/*
- * It is not possible to include ctdb.h and tdb_compat.h (included via
- * some other include above) without warnings. This fixes those
- * warnings.
- */
-
-#ifdef typesafe_cb
-#undef typesafe_cb
-#endif
-
-#ifdef typesafe_cb_preargs
-#undef typesafe_cb_preargs
-#endif
-
-#ifdef typesafe_cb_postargs
-#undef typesafe_cb_postargs
-#endif
-
 #include "ctdb.h"
 #include "ctdb_private.h"
 #include "ctdbd_conn.h"

diff --git a/source3/lib/eventlog/eventlog.h b/source3/lib/eventlog/eventlog.h
index 694732d184aa6abbba4af46c04ebaa9b2040fb9b..b485bfe08e93fa908a0068b49f81f7044a14cc4b 100644 (file)
--- a/source3/lib/eventlog/eventlog.h
+++ b/source3/lib/eventlog/eventlog.h
@@ -17,7 +17,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tdb_compat.h"
+#include <tdb.h>
 
 /* Defines for TDB keys */
 #define  EVT_OLDEST_ENTRY  "INFO/oldest_entry"

diff --git a/source3/lib/messages_ctdbd.c b/source3/lib/messages_ctdbd.c
index 1268bd4a5060b169515185ca181f6c9e9cccc1d3..799780e6a141096937af3f58adfbe604e95787db 100644 (file)
--- a/source3/lib/messages_ctdbd.c
+++ b/source3/lib/messages_ctdbd.c
@@ -22,24 +22,6 @@
 #include "util_tdb.h"
 #include "lib/util/iov_buf.h"
 
-/*
- * It is not possible to include ctdb.h and tdb_compat.h (included via
- * some other include above) without warnings. This fixes those
- * warnings.
- */
-
-#ifdef typesafe_cb
-#undef typesafe_cb
-#endif
-
-#ifdef typesafe_cb_preargs
-#undef typesafe_cb_preargs
-#endif
-
-#ifdef typesafe_cb_postargs
-#undef typesafe_cb_postargs
-#endif
-
 #include "ctdb.h"
 #include "ctdb_private.h"
 #include "ctdbd_conn.h"

diff --git a/source3/lib/tdb_validate.h b/source3/lib/tdb_validate.h
index 5bb043d2924c6a75345a420b7631c16fb9c55d87..3e7c20d04cffaa2127dadc22cbed0e63440d0734 100644 (file)
--- a/source3/lib/tdb_validate.h
+++ b/source3/lib/tdb_validate.h
@@ -23,7 +23,7 @@
 #define __TDB_VALIDATE_H__
 
 #include "lib/replace/replace.h"
-#include "tdb_compat.h"
+#include <tdb.h>
 
 /**
  * Flag field for keeping track of the status of a validation.

diff --git a/source3/libsmb/smb_share_modes.c b/source3/libsmb/smb_share_modes.c
index 7a6acc3d798a19126229694a6514942a99c968ff..ddab0ca1279a1de8b1cf443ac2def33118255dea 100644 (file)
--- a/source3/libsmb/smb_share_modes.c
+++ b/source3/libsmb/smb_share_modes.c
@@ -35,7 +35,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "smb_share_modes.h"
-#include "tdb_compat.h"
+#include <tdb.h>
 #include "librpc/gen_ndr/open_files.h"
 #include <ccan/hash/hash.h>
 

diff --git a/source3/modules/vfs_posix_eadb.c b/source3/modules/vfs_posix_eadb.c
index 27996db73db0a9ce4a7cb50fea7ddb292fb27791..993c919485ef807342e95b4473024173c8d7df80 100644 (file)
--- a/source3/modules/vfs_posix_eadb.c
+++ b/source3/modules/vfs_posix_eadb.c
@@ -26,7 +26,7 @@
 #include "librpc/gen_ndr/xattr.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
-#include "tdb_compat.h"
+#include <tdb.h>
 #include "lib/tdb_wrap/tdb_wrap.h"
 #include "ntvfs/posix/posix_eadb.h"
 #include "param/param.h"

diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index 2464b0e31b0617877822a121cdb145c1d8e66791..9bbd5caa8d11f3bb0a0f9d1cd1ec9fd90c4f07ad 100644 (file)
--- a/source3/passdb/wscript_build
+++ b/source3/passdb/wscript_build
@@ -3,7 +3,7 @@
 bld.SAMBA3_MODULE('pdb_tdbsam',
                  subsystem='pdb',
                  source='pdb_tdb.c',
-                 deps='samba-util tdb_compat dbwrap tdb-wrap3',
+                 deps='samba-util dbwrap tdb-wrap3',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_tdbsam'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_tdbsam'))
@@ -43,6 +43,6 @@ bld.SAMBA3_MODULE('pdb_samba_dsdb',
 bld.SAMBA3_PYTHON('pypassdb',
                   source='py_passdb.c',
                   deps='pdb',
-                  public_deps='samba-util tdb_compat talloc pyrpc_util',
+                  public_deps='samba-util tdb talloc pyrpc_util',
                   realname='samba/samba3/passdb.so'
                   )

diff --git a/source3/smbd/globals.c b/source3/smbd/globals.c
index c9da6db9c63107ff220d600034875621bfc76933..03339b78fc8bd58b6db177c645e8d5c9d01b6850 100644 (file)
--- a/source3/smbd/globals.c
+++ b/source3/smbd/globals.c
@@ -22,7 +22,7 @@
 #include "smbd/globals.h"
 #include "../lib/util/memcache.h"
 #include "messages.h"
-#include "tdb_compat.h"
+#include <tdb.h>
 
 int aio_pending_size = 100;    /* tevent supports 100 signals SA_SIGINFO */
 int outstanding_aio_calls = 0;

diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index 2f3b067012ecdaec829687b4e1bd4eb180d171ec..b0b264082aea1932f2d0c2ee0ae5c63561081d10 100644 (file)
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -25,7 +25,7 @@
 #include "smbd/smbd.h"
 #include "messages.h"
 #include "smbprofile.h"
-#include "tdb_compat.h"
+#include <tdb.h>
 
 /****************************************************************************
  Stat cache code used in unix_convert.

diff --git a/source3/wscript_build b/source3/wscript_build
index 767217d817a7acaa59c2df0efe089f9fb6ed2aa2..4368cbf0b50f052b6b6320d8f2e1339a9d6845ac 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -91,7 +91,7 @@ bld.SAMBA3_SUBSYSTEM('AVAHI',
 
 bld.SAMBA3_SUBSYSTEM('GROUPDB',
                     source='groupdb/mapping.c groupdb/mapping_tdb.c',
-                    deps='tdb_compat')
+                    deps='tdb')
 
 bld.SAMBA3_SUBSYSTEM('TLDAP',
                     source='''lib/tldap.c
@@ -642,7 +642,7 @@ bld.SAMBA3_SUBSYSTEM('LOCKING',
                     locking/posix.c
                     locking/share_mode_lock.c''',
                     deps='''
-                    tdb_compat
+                    tdb
                     talloc
                     LEASES_DB
                     NDR_OPEN_FILES
@@ -663,7 +663,7 @@ else:
 
 bld.SAMBA3_SUBSYSTEM('PRINTBASE',
                     source='''printing/notify.c printing/printing_db.c''',
-                    deps='samba-util tdb_compat')
+                    deps='samba-util tdb')
 
 bld.SAMBA3_SUBSYSTEM('PRINTBACKEND',
                     source='''printing/printing.c
@@ -672,7 +672,7 @@ bld.SAMBA3_SUBSYSTEM('PRINTBACKEND',
                     printing/nt_printing_migrate_internal.c
                     printing/nt_printing_ads.c
                     printing/queue_process.c''',
-                    deps='PRINTBASE LIBADS_PRINTER tdb_compat printing_migrate')
+                    deps='PRINTBASE LIBADS_PRINTER tdb printing_migrate')
 
 bld.SAMBA3_LIBRARY('printing_migrate',
                     source='printing/nt_printing_migrate.c rpc_client/cli_winreg_spoolss.c printing/nt_printing_os2.c',
@@ -690,7 +690,7 @@ bld.SAMBA3_SUBSYSTEM('PRINTING',
                     printing/print_standard.c
                     printing/print_iprint.c
                     printing/printer_list.c''',
-                    deps='NDR_PRINTCAP tdb_compat cups')
+                    deps='NDR_PRINTCAP tdb cups')
 
 bld.SAMBA3_SUBSYSTEM('PASSWD_UTIL',
                     source='utils/passwd_util.c',
@@ -727,7 +727,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNET_SAMSYNC',
 
 bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG',
                     source='lib/eventlog/eventlog.c',
-                    deps='NDR_EVENTLOG tdb_compat')
+                    deps='NDR_EVENTLOG tdb')
 
 bld.SAMBA3_SUBSYSTEM('LIBNMB',
                      source='''libsmb/unexpected.c
@@ -764,7 +764,7 @@ bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION',
 
 bld.SAMBA3_SUBSYSTEM('SLCACHE',
                     source='libsmb/samlogon_cache.c',
-                    deps='samba-util tdb_compat')
+                    deps='samba-util tdb')
 
 bld.SAMBA3_SUBSYSTEM('DCUTIL',
                     source='''libsmb/namequery_dc.c

diff --git a/source4/dsdb/samdb/ldb_modules/schema_load.c b/source4/dsdb/samdb/ldb_modules/schema_load.c
index c083da48b9eb945a0172c032e1af8147f7868041..8449543ad166b2a5e603d6e1d3537880fe40e3f0 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/schema_load.c
+++ b/source4/dsdb/samdb/ldb_modules/schema_load.c
@@ -29,8 +29,8 @@
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
 #include "param/param.h"
+#include <tdb.h>
 #include "lib/tdb_wrap/tdb_wrap.h"
-#include "lib/tdb_compat/tdb_compat.h"
 #include "dsdb/samdb/ldb_modules/util.h"
 
 #include "system/filesys.h"

diff --git a/source4/ntvfs/posix/python/pyposix_eadb.c b/source4/ntvfs/posix/python/pyposix_eadb.c
index 9db0ddb770b1b65294bd0809f4eabb2ef81f1d25..0c529531eb7920b39fb2476c3851eddd13018024 100644 (file)
--- a/source4/ntvfs/posix/python/pyposix_eadb.c
+++ b/source4/ntvfs/posix/python/pyposix_eadb.c
@@ -21,7 +21,7 @@
 #include <Python.h>
 #include "includes.h"
 #include "system/filesys.h"
-#include "tdb_compat.h"
+#include <tdb.h>
 #include "lib/tdb_wrap/tdb_wrap.h"
 #include "librpc/ndr/libndr.h"
 #include "ntvfs/posix/posix_eadb.h"

diff --git a/source4/ntvfs/posix/python/pyxattr_tdb.c b/source4/ntvfs/posix/python/pyxattr_tdb.c
index b866d7eea811882f5fc917aa55ca9f6f732b1a77..d3390a3d906c9e796d9b9452598f2ab9ef27d8e6 100644 (file)
--- a/source4/ntvfs/posix/python/pyxattr_tdb.c
+++ b/source4/ntvfs/posix/python/pyxattr_tdb.c
@@ -21,7 +21,7 @@
 #include <Python.h>
 #include "includes.h"
 #include "system/filesys.h"
-#include "tdb_compat.h"
+#include <tdb.h>
 #include "lib/tdb_wrap/tdb_wrap.h"
 #include "librpc/ndr/libndr.h"
 #include "ntvfs/posix/posix_eadb.h"

diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c
index 0ce2e6f5a8748cbcba250569e989f29f502d9134..7d1fea549fac24098669f7c2d144de5eada0cd97 100644 (file)
--- a/source4/ntvfs/posix/vfs_posix.c
+++ b/source4/ntvfs/posix/vfs_posix.c
@@ -26,7 +26,7 @@
 #include "includes.h"
 #include "vfs_posix.h"
 #include "librpc/gen_ndr/security.h"
-#include "tdb_compat.h"
+#include <tdb.h>
 #include "lib/tdb_wrap/tdb_wrap.h"
 #include "libcli/security/security.h"
 #include "lib/events/events.h"

diff --git a/source4/ntvfs/posix/wscript_build b/source4/ntvfs/posix/wscript_build
index a39989b8982a9442f23e80c34b9c0f30890774c7..06fea0b14d6f1d088c687876abadefcf55df20c0 100644 (file)
--- a/source4/ntvfs/posix/wscript_build
+++ b/source4/ntvfs/posix/wscript_build
@@ -54,7 +54,7 @@ bld.SAMBA_LIBRARY('posix_eadb',
 
 bld.SAMBA_PYTHON('python_posix_eadb',
        source='python/pyposix_eadb.c',
-       deps='pyparam_util posix_eadb tdb_compat',
+       deps='pyparam_util posix_eadb tdb',
        realname='samba/posix_eadb.so'
        )
 

diff --git a/source4/torture/basic/mangle_test.c b/source4/torture/basic/mangle_test.c
index a15dc00939bc95b4be06ca67518e51e225ae4886..0b7d696e67732352cb458407b4cf7d95801102b1 100644 (file)
--- a/source4/torture/basic/mangle_test.c
+++ b/source4/torture/basic/mangle_test.c
@@ -20,7 +20,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "system/dir.h"
-#include "../lib/tdb_compat/tdb_compat.h"
+#include <tdb.h>
 #include "../lib/util/util_tdb.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"

diff --git a/source4/torture/local/dbspeed.c b/source4/torture/local/dbspeed.c
index 0ef120296f4e1c1688a72c170a637df3d4b24942..9452d6a7e7c1471fe0fc2361fe906b0561c988a7 100644 (file)
--- a/source4/torture/local/dbspeed.c
+++ b/source4/torture/local/dbspeed.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "tdb_compat.h"
+#include <tdb.h>
 #include <ldb.h>
 #include <ldb_errors.h>
 #include "ldb_wrap.h"

diff --git a/wscript_build b/wscript_build
index d525b27187c8b36d08ea84047e5b2390232b8149..4e5806351084401c0219e0d4a1bfabb7545d2556 100644 (file)
--- a/wscript_build
+++ b/wscript_build
@@ -42,7 +42,6 @@ bld.RECURSE('lib/tevent')
 bld.RECURSE('lib/texpect')
 bld.RECURSE('lib/addns')
 bld.RECURSE('lib/ccan')
-bld.RECURSE('lib/tdb_compat')
 bld.RECURSE('lib/ldb')
 bld.RECURSE('lib/param')
 bld.RECURSE('dynconfig')