diff options
24 files changed, 29 insertions, 27 deletions
diff --git a/lib/util/tdb_wrap.c b/lib/tdb_wrap/tdb_wrap.c index 7c3318bcad..0994b1b79c 100644 --- a/lib/util/tdb_wrap.c +++ b/lib/tdb_wrap/tdb_wrap.c @@ -21,7 +21,7 @@ #include "includes.h" #include "lib/util/dlinklist.h" -#include "lib/util/tdb_wrap.h" +#include "lib/tdb_wrap/tdb_wrap.h" #include "lib/param/param.h" /* FIXME: TDB2 does this internally, so no need to wrap multiple opens! */ diff --git a/lib/util/tdb_wrap.h b/lib/tdb_wrap/tdb_wrap.h index 81e77e76a4..81e77e76a4 100644 --- a/lib/util/tdb_wrap.h +++ b/lib/tdb_wrap/tdb_wrap.h diff --git a/lib/tdb_wrap/wscript_build b/lib/tdb_wrap/wscript_build new file mode 100644 index 0000000000..0811bc5a2d --- /dev/null +++ b/lib/tdb_wrap/wscript_build @@ -0,0 +1,8 @@ +#!/usr/bin/python + +bld.SAMBA_LIBRARY('tdb-wrap', + source='tdb_wrap.c', + deps='tdb_compat talloc samba-util samba-hostconfig', + private_library=True, + local_include=False + ) diff --git a/lib/util/wscript_build b/lib/util/wscript_build index 1dc65fab5e..79b9f02050 100755 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -85,10 +85,3 @@ bld.SAMBA_SUBSYSTEM('UTIL_PW', public_deps='talloc' ) - -bld.SAMBA_LIBRARY('tdb-wrap', - source='tdb_wrap.c', - deps='tdb_compat talloc samba-util samba-hostconfig', - private_library=True, - local_include=False - ) diff --git a/libcli/auth/schannel_state_tdb.c b/libcli/auth/schannel_state_tdb.c index f2b918816a..5d5ddcc45d 100644 --- a/libcli/auth/schannel_state_tdb.c +++ b/libcli/auth/schannel_state_tdb.c @@ -28,7 +28,7 @@ #include "../lib/param/param.h" #include "../libcli/auth/schannel.h" #include "../librpc/gen_ndr/ndr_schannel.h" -#include "lib/util/tdb_wrap.h" +#include "lib/tdb_wrap/tdb_wrap.h" #define SECRETS_SCHANNEL_STATE "SECRETS/SCHANNEL" diff --git a/source3/Makefile.in b/source3/Makefile.in index dc02b6a4cd..5fcf8598e3 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -256,7 +256,7 @@ EXTRA_ALL_TARGETS = @EXTRA_ALL_TARGETS@ ###################################################################### TDB_LIB_OBJ = lib/util_tdb.o ../lib/util/util_tdb.o \ - ../lib/util/tdb_wrap.o \ + ../lib/tdb_wrap/tdb_wrap.o \ lib/dbwrap/dbwrap.o \ lib/dbwrap/dbwrap_open.o \ lib/dbwrap/dbwrap_tdb.o \ diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c index 2e0146fdb0..d50f75ef5d 100644 --- a/source3/lib/dbwrap/dbwrap_ctdb.c +++ b/source3/lib/dbwrap/dbwrap_ctdb.c @@ -20,7 +20,7 @@ #include "includes.h" #include "system/filesys.h" -#include "lib/util/tdb_wrap.h" +#include "lib/tdb_wrap/tdb_wrap.h" #include "util_tdb.h" #include "dbwrap/dbwrap_ctdb.h" #include "dbwrap/dbwrap_rbt.h" diff --git a/source3/lib/dbwrap/dbwrap_tdb.c b/source3/lib/dbwrap/dbwrap_tdb.c index 2c82810c50..454073a52f 100644 --- a/source3/lib/dbwrap/dbwrap_tdb.c +++ b/source3/lib/dbwrap/dbwrap_tdb.c @@ -21,7 +21,7 @@ #include "dbwrap/dbwrap.h" #include "dbwrap/dbwrap_private.h" #include "dbwrap/dbwrap_tdb.h" -#include "lib/util/tdb_wrap.h" +#include "lib/tdb_wrap/tdb_wrap.h" #include "lib/param/param.h" #include "util_tdb.h" diff --git a/source3/lib/messages_local.c b/source3/lib/messages_local.c index 9b4e3c5e43..b398870e1f 100644 --- a/source3/lib/messages_local.c +++ b/source3/lib/messages_local.c @@ -45,7 +45,7 @@ #include "includes.h" #include "system/filesys.h" #include "messages.h" -#include "lib/util/tdb_wrap.h" +#include "lib/tdb_wrap/tdb_wrap.h" #include "lib/param/param.h" struct messaging_tdb_context { diff --git a/source3/lib/server_mutex.c b/source3/lib/server_mutex.c index 7ceecfe770..9430141d1c 100644 --- a/source3/lib/server_mutex.c +++ b/source3/lib/server_mutex.c @@ -20,7 +20,7 @@ #include "includes.h" #include "system/filesys.h" -#include "lib/util/tdb_wrap.h" +#include "lib/tdb_wrap/tdb_wrap.h" #include "util_tdb.h" #include "lib/param/param.h" diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c index 02de2b4f9c..48d5b4251a 100644 --- a/source3/lib/serverid.c +++ b/source3/lib/serverid.c @@ -23,7 +23,7 @@ #include "util_tdb.h" #include "dbwrap/dbwrap.h" #include "dbwrap/dbwrap_open.h" -#include "lib/util/tdb_wrap.h" +#include "lib/tdb_wrap/tdb_wrap.h" #include "lib/param/param.h" #include "ctdbd_conn.h" #include "messages.h" diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c index be91cd58cd..d68a720e6b 100644 --- a/source3/smbd/notify_internal.c +++ b/source3/smbd/notify_internal.c @@ -30,7 +30,7 @@ #include "dbwrap/dbwrap_open.h" #include "smbd/smbd.h" #include "messages.h" -#include "lib/util/tdb_wrap.h" +#include "lib/tdb_wrap/tdb_wrap.h" #include "util_tdb.h" #include "lib/param/param.h" diff --git a/source4/cluster/local.c b/source4/cluster/local.c index c62c5cf405..24cbe81c48 100644 --- a/source4/cluster/local.c +++ b/source4/cluster/local.c @@ -23,7 +23,7 @@ #include "cluster/cluster.h" #include "cluster/cluster_private.h" #include "tdb_compat.h" -#include "lib/util/tdb_wrap.h" +#include "lib/tdb_wrap/tdb_wrap.h" #include "system/filesys.h" #include "param/param.h" #include "librpc/gen_ndr/server_id.h" diff --git a/source4/dsdb/samdb/ldb_modules/partition.h b/source4/dsdb/samdb/ldb_modules/partition.h index 0cb5705ada..ea05e9404d 100644 --- a/source4/dsdb/samdb/ldb_modules/partition.h +++ b/source4/dsdb/samdb/ldb_modules/partition.h @@ -21,7 +21,7 @@ #include <ldb.h> #include <ldb_errors.h> #include <ldb_module.h> -#include "lib/util/tdb_wrap.h" +#include "lib/tdb_wrap/tdb_wrap.h" #include "dsdb/samdb/samdb.h" #include "dsdb/samdb/ldb_modules/util.h" #include "system/locale.h" diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c index 21ff1b456a..9c337f65a5 100644 --- a/source4/lib/messaging/messaging.c +++ b/source4/lib/messaging/messaging.c @@ -27,7 +27,7 @@ #include "lib/socket/socket.h" #include "librpc/gen_ndr/ndr_irpc.h" #include "lib/messaging/irpc.h" -#include "lib/util/tdb_wrap.h" +#include "lib/tdb_wrap/tdb_wrap.h" #include "../lib/util/unix_privs.h" #include "librpc/rpc/dcerpc.h" #include "../lib/tdb_compat/tdb_compat.h" diff --git a/source4/ntvfs/common/brlock_tdb.c b/source4/ntvfs/common/brlock_tdb.c index fcaa756530..5c89b41b22 100644 --- a/source4/ntvfs/common/brlock_tdb.c +++ b/source4/ntvfs/common/brlock_tdb.c @@ -28,7 +28,7 @@ #include "system/filesys.h" #include "tdb_compat.h" #include "messaging/messaging.h" -#include "lib/util/tdb_wrap.h" +#include "lib/tdb_wrap/tdb_wrap.h" #include "lib/messaging/irpc.h" #include "libcli/libcli.h" #include "cluster/cluster.h" diff --git a/source4/ntvfs/common/notify.c b/source4/ntvfs/common/notify.c index 98f17a6565..6b5ece9e4e 100644 --- a/source4/ntvfs/common/notify.c +++ b/source4/ntvfs/common/notify.c @@ -28,7 +28,7 @@ #include "../lib/tdb_compat/tdb_compat.h" #include "../lib/util/util_tdb.h" #include "messaging/messaging.h" -#include "lib/util/tdb_wrap.h" +#include "lib/tdb_wrap/tdb_wrap.h" #include "lib/messaging/irpc.h" #include "librpc/gen_ndr/ndr_notify.h" #include "../lib/util/dlinklist.h" diff --git a/source4/ntvfs/common/opendb_tdb.c b/source4/ntvfs/common/opendb_tdb.c index 9884e1f8b0..ed8fb9032a 100644 --- a/source4/ntvfs/common/opendb_tdb.c +++ b/source4/ntvfs/common/opendb_tdb.c @@ -42,7 +42,7 @@ #include "system/filesys.h" #include "../lib/tdb_compat/tdb_compat.h" #include "messaging/messaging.h" -#include "lib/util/tdb_wrap.h" +#include "lib/tdb_wrap/tdb_wrap.h" #include "lib/messaging/irpc.h" #include "librpc/gen_ndr/ndr_opendb.h" #include "ntvfs/ntvfs.h" diff --git a/source4/ntvfs/posix/python/pyxattr_tdb.c b/source4/ntvfs/posix/python/pyxattr_tdb.c index 7248560039..1fdae7606d 100644 --- 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 "tdb_compat.h" -#include "lib/util/tdb_wrap.h" +#include "lib/tdb_wrap/tdb_wrap.h" #include "librpc/ndr/libndr.h" #include "lib/util/wrap_xattr.h" #include "ntvfs/posix/vfs_posix.h" diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c index cecaee00cc..3a3d1ea1c5 100644 --- a/source4/ntvfs/posix/vfs_posix.c +++ b/source4/ntvfs/posix/vfs_posix.c @@ -27,7 +27,7 @@ #include "vfs_posix.h" #include "librpc/gen_ndr/security.h" #include "tdb_compat.h" -#include "lib/util/tdb_wrap.h" +#include "lib/tdb_wrap/tdb_wrap.h" #include "libcli/security/security.h" #include "lib/events/events.h" #include "param/param.h" diff --git a/source4/ntvfs/posix/xattr_tdb.c b/source4/ntvfs/posix/xattr_tdb.c index 07b3712215..2a320ba7a6 100644 --- a/source4/ntvfs/posix/xattr_tdb.c +++ b/source4/ntvfs/posix/xattr_tdb.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "lib/util/tdb_wrap.h" +#include "lib/tdb_wrap/tdb_wrap.h" #include "tdb_compat.h" #include "vfs_posix.h" diff --git a/source4/param/secrets.c b/source4/param/secrets.c index 32a97453d4..aaf6259ef0 100644 --- a/source4/param/secrets.c +++ b/source4/param/secrets.c @@ -25,7 +25,7 @@ #include "secrets.h" #include "param/param.h" #include "system/filesys.h" -#include "lib/util/tdb_wrap.h" +#include "lib/tdb_wrap/tdb_wrap.h" #include "lib/ldb-samba/ldb_wrap.h" #include <ldb.h> #include "../lib/util/util_tdb.h" diff --git a/source4/torture/local/dbspeed.c b/source4/torture/local/dbspeed.c index 60721cc2c0..51ea8eaeef 100644 --- a/source4/torture/local/dbspeed.c +++ b/source4/torture/local/dbspeed.c @@ -25,7 +25,7 @@ #include <ldb.h> #include <ldb_errors.h> #include "ldb_wrap.h" -#include "lib/util/tdb_wrap.h" +#include "lib/tdb_wrap/tdb_wrap.h" #include "torture/smbtorture.h" #include "param/param.h" diff --git a/wscript_build b/wscript_build index ab6f9be40c..f5dff8d6fe 100644 --- a/wscript_build +++ b/wscript_build @@ -65,6 +65,7 @@ bld.RECURSE('lib/uid_wrapper') bld.RECURSE('lib/popt') bld.RECURSE('source4/lib/stream') bld.RECURSE('lib/util') +bld.RECURSE('lib/tdb_wrap') bld.RECURSE('lib/tdr') bld.RECURSE('lib/tsocket') bld.RECURSE('lib/crypto') |