sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s3:dbwrap: move all .c and .h files of dbwrap to lib/dbwrap/

Browse Source 
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Fri Jul 29 13:34:22 CEST 2011 on sn-devel-104
This commit is contained in:
Michael Adam 2011-07-07 17:42:08 +02:00
parent d4c93ca721
commit 0b5c4a601a
50 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source3/Makefile.in
View File

@ -260,11 +260,12 @@ EXTRA_ALL_TARGETS = @EXTRA_ALL_TARGETS@
TDB_LIB_OBJ = lib/util_tdb.o ../lib/util/util_tdb.o \
../lib/util/tdb_wrap.o \
lib/dbwrap.o lib/dbwrap/dbwrap_open.o \
lib/dbwrap_tdb.o \
lib/dbwrap_ctdb.o \
lib/dbwrap/dbwrap.o \
lib/dbwrap/dbwrap_open.o \
lib/dbwrap/dbwrap_tdb.o \
lib/dbwrap/dbwrap_ctdb.o \
lib/g_lock.o \
lib/dbwrap_rbt.o
lib/dbwrap/dbwrap_rbt.o
TDB_VALIDATE_OBJ = lib/tdb_validate.o
@ -454,7 +455,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \
../lib/util/charset/util_unistr_w.o ../lib/util/charset/codepoints.o ../lib/util/charset/util_str.o lib/util_file.o \
lib/util.o lib/util_malloc.o lib/namearray.o lib/util_cmdline.o lib/util_names.o \
lib/util_sock.o lib/sock_exec.o lib/util_sec.o \
lib/substitute.o lib/substitute_generic.o ../lib/util/substitute.o lib/dbwrap_util.o \
lib/substitute.o lib/substitute_generic.o ../lib/util/substitute.o lib/dbwrap/dbwrap_util.o \
lib/ms_fnmatch.o ../lib/util/ms_fnmatch.o lib/errmap_unix.o ../libcli/util/errmap_unix.o \
lib/tallocmsg.o lib/dmallocmsg.o \
libsmb/clisigning.o libsmb/smb_signing.o \

2
source3/groupdb/mapping_tdb.c
View File

@ -24,7 +24,7 @@
#include "system/filesys.h"
#include "passdb.h"
#include "groupdb/mapping.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "util_tdb.h"
#include "../libcli/security/security.h"

2
source3/include/g_lock.h
View File

@ -20,7 +20,7 @@
#ifndef _G_LOCK_H_
#define _G_LOCK_H_
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
struct g_lock_ctx;

2
source3/lib/conn_tdb.c
View File

@ -20,7 +20,7 @@
#include "includes.h"
#include "system/filesys.h"
#include "smbd/globals.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
static struct db_context *connections_db_ctx(bool rw)

2
source3/lib/dbwrap.c → source3/lib/dbwrap/dbwrap.c
View File

@ -20,7 +20,7 @@
*/
#include "includes.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_private.h"
/*

0
source3/include/dbwrap.h → source3/lib/dbwrap/dbwrap.h
View File

2
source3/lib/dbwrap_ctdb.c → source3/lib/dbwrap/dbwrap_ctdb.c
View File

@ -26,7 +26,7 @@
#include "ctdb.h"
#include "ctdb_private.h"
#include "ctdbd_conn.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "g_lock.h"
#include "messages.h"

0
source3/lib/dbwrap_file.c → source3/lib/dbwrap/dbwrap_file.c
View File

2
source3/lib/dbwrap/dbwrap_open.c
View File

@ -19,7 +19,7 @@
*/
#include "includes.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_private.h"
#include "dbwrap/dbwrap_open.h"
#include "util_tdb.h"

2
source3/lib/dbwrap_rbt.c → source3/lib/dbwrap/dbwrap_rbt.c
View File

@ -18,7 +18,7 @@
*/
#include "includes.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "../lib/util/rbtree.h"
#define DBWRAP_RBT_ALIGN(_size_) (((_size_)+15)&~15)

2
source3/lib/dbwrap_tdb.c → source3/lib/dbwrap/dbwrap_tdb.c
View File

@ -18,7 +18,7 @@
*/
#include "includes.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "lib/util/tdb_wrap.h"
struct db_tdb_ctx {

0
source3/lib/dbwrap_util.c → source3/lib/dbwrap/dbwrap_util.c
View File

2
source3/lib/g_lock.c
View File

@ -19,7 +19,7 @@
#include "includes.h"
#include "system/filesys.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "g_lock.h"
#include "util_tdb.h"

2
source3/lib/messages.c
View File

@ -46,7 +46,7 @@
*/
#include "includes.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "serverid.h"
#include "messages.h"

2
source3/lib/privileges.c
View File

@ -23,7 +23,7 @@
#include "includes.h"
#include "lib/privileges.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "libcli/security/privileges_private.h"
#include "../libcli/security/security.h"
#include "passdb.h"

2
source3/lib/serverid.c
View File

@ -21,7 +21,7 @@
#include "system/filesys.h"
#include "serverid.h"
#include "util_tdb.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "lib/util/tdb_wrap.h"

2
source3/lib/sessionid_tdb.c
View File

@ -19,7 +19,7 @@
#include "includes.h"
#include "system/filesys.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "session.h"
#include "util_tdb.h"

2
source3/lib/sharesec.c
View File

@ -21,7 +21,7 @@
#include "system/filesys.h"
#include "../libcli/security/security.h"
#include "../librpc/gen_ndr/ndr_security.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "util_tdb.h"

2
source3/lib/talloc_dict.c
View File

@ -18,7 +18,7 @@
*/
#include "includes.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "talloc_dict.h"
#include "util_tdb.h"

2
source3/libnet/libnet_dssync_passdb.c
View File

@ -24,7 +24,7 @@
#include "../libds/common/flags.h"
#include "../librpc/gen_ndr/ndr_drsuapi.h"
#include "util_tdb.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "../libds/common/flag_mapping.h"
#include "passdb.h"

2
source3/locking/brlock.c
View File

@ -28,7 +28,7 @@
#include "system/filesys.h"
#include "locking/proto.h"
#include "smbd/globals.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "serverid.h"
#include "messages.h"

2
source3/locking/locking.c
View File

@ -39,7 +39,7 @@
#include "system/filesys.h"
#include "locking/proto.h"
#include "smbd/globals.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "../libcli/security/security.h"
#include "serverid.h"

2
source3/locking/posix.c
View File

@ -24,7 +24,7 @@
#include "includes.h"
#include "system/filesys.h"
#include "locking/proto.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "util_tdb.h"
#undef DBGC_CLASS

2
source3/modules/nfs4_acls.c
View File

@ -23,7 +23,7 @@
#include "librpc/gen_ndr/ndr_security.h"
#include "../libcli/security/dom_sid.h"
#include "../libcli/security/security.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "system/filesys.h"
#include "passdb/lookup_sid.h"

2
source3/modules/vfs_acl_tdb.c
View File

@ -26,7 +26,7 @@
#include "librpc/gen_ndr/xattr.h"
#include "librpc/gen_ndr/ndr_xattr.h"
#include "../lib/crypto/crypto.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "auth.h"
#include "util_tdb.h"

2
source3/modules/vfs_xattr_tdb.c
View File

@ -23,7 +23,7 @@
#include "librpc/gen_ndr/xattr.h"
#include "librpc/gen_ndr/ndr_xattr.h"
#include "../librpc/gen_ndr/ndr_netlogon.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "util_tdb.h"

2
source3/param/loadparm.c
View File

@ -65,7 +65,7 @@
#include "../librpc/gen_ndr/svcctl.h"
#include "intl.h"
#include "smb_signing.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "smbldap.h"
#include "../lib/util/bitmap.h"

2
source3/passdb/account_pol.c
View File

@ -22,7 +22,7 @@
#include "includes.h"
#include "system/filesys.h"
#include "passdb.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "../libcli/security/security.h"
#include "lib/privileges.h"

2
source3/passdb/machine_account_secrets.c
View File

@ -26,7 +26,7 @@
#include "passdb.h"
#include "../libcli/auth/libcli_auth.h"
#include "secrets.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "../librpc/ndr/libndr.h"
#include "util_tdb.h"

2
source3/passdb/machine_sid.c
View File

@ -23,7 +23,7 @@
#include "includes.h"
#include "passdb.h"
#include "secrets.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "../libcli/security/security.h"
/* NOTE! the global_sam_sid is the SID of our local SAM. This is only

2
source3/passdb/pdb_tdb.c
View File

@ -25,7 +25,7 @@
#include "includes.h"
#include "system/filesys.h"
#include "passdb.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "../libcli/security/security.h"
#include "util_tdb.h"

2
source3/passdb/secrets.c
View File

@ -28,7 +28,7 @@
#include "../libcli/auth/libcli_auth.h"
#include "librpc/gen_ndr/ndr_secrets.h"
#include "secrets.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "../libcli/security/security.h"
#include "util_tdb.h"

2
source3/printing/printer_list.c
View File

@ -19,7 +19,7 @@
#include "includes.h"
#include "system/filesys.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "util_tdb.h"
#include "printer_list.h"

2
source3/registry/reg_backend_db.c
View File

@ -30,7 +30,7 @@
#include "reg_objects.h"
#include "nt_printing.h"
#include "util_tdb.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "../libcli/security/secdesc.h"

2
source3/registry/reg_objects.c
View File

@ -24,7 +24,7 @@
#include "registry.h"
#include "reg_objects.h"
#include "util_tdb.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "../libcli/registry/util_reg.h"
#undef DBGC_CLASS

2
source3/rpc_server/srvsvc/srv_srvsvc_nt.c
View File

@ -29,7 +29,7 @@
#include "../librpc/gen_ndr/srv_srvsvc.h"
#include "../libcli/security/security.h"
#include "../librpc/gen_ndr/ndr_security.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "session.h"
#include "../lib/util/util_pw.h"
#include "smbd/smbd.h"

2
source3/smbd/connection.c
View File

@ -20,7 +20,7 @@
#include "includes.h"
#include "smbd/smbd.h"
#include "smbd/globals.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "auth.h"
#include "../lib/tsocket/tsocket.h"

2
source3/smbd/notify_internal.c
View File

@ -26,7 +26,7 @@
#include "includes.h"
#include "system/filesys.h"
#include "librpc/gen_ndr/ndr_notify.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "smbd/smbd.h"
#include "messages.h"

2
source3/smbd/session.c
View File

@ -29,7 +29,7 @@
#include "includes.h"
#include "smbd/smbd.h"
#include "smbd/globals.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "session.h"
#include "auth.h"
#include "../lib/tsocket/tsocket.h"

2
source3/torture/torture.c
View File

@ -28,7 +28,7 @@
#include "../librpc/gen_ndr/svcctl.h"
#include "memcache.h"
#include "nsswitch/winbind_client.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "talloc_dict.h"
#include "async_smb.h"

2
source3/utils/dbwrap_tool.c
View File

@ -21,7 +21,7 @@
#include "includes.h"
#include "system/filesys.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "messages.h"

2
source3/utils/dbwrap_torture.c
View File

@ -22,7 +22,7 @@
#include "includes.h"
#include "system/filesys.h"
#include "popt_common.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "messages.h"

2
source3/utils/net_idmap.c
View File

@ -22,7 +22,7 @@
#include "utils/net.h"
#include "secrets.h"
#include "idmap.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "../libcli/security/security.h"
#include "net_idmap_check.h"

2
source3/utils/net_idmap_check.c
View File

@ -26,7 +26,7 @@
#include "net_idmap_check.h"
#include "includes.h"
#include "system/filesys.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "net.h"
#include "../libcli/security/dom_sid.h"

2
source3/utils/net_serverid.c
View File

@ -19,7 +19,7 @@
#include "includes.h"
#include "utils/net.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "serverid.h"
#include "session.h"

2
source3/utils/status.c
View File

@ -33,7 +33,7 @@
#include "includes.h"
#include "system/filesys.h"
#include "popt_common.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "../libcli/security/security.h"
#include "session.h"

2
source3/winbindd/idmap_autorid.c
View File

@ -25,7 +25,7 @@
#include "includes.h"
#include "system/filesys.h"
#include "winbindd.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "idmap.h"
#include "../libcli/security/dom_sid.h"

2
source3/winbindd/idmap_tdb.c
View File

@ -28,7 +28,7 @@
#include "winbindd.h"
#include "idmap.h"
#include "idmap_rw.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "../libcli/security/security.h"
#include "util_tdb.h"

2
source3/winbindd/idmap_tdb2.c
View File

@ -36,7 +36,7 @@
#include "winbindd.h"
#include "idmap.h"
#include "idmap_rw.h"
#include "dbwrap.h"
#include "dbwrap/dbwrap.h"
#include "dbwrap/dbwrap_open.h"
#include "../libcli/security/dom_sid.h"
#include "util_tdb.h"

6
source3/wscript_build
View File

@ -15,8 +15,8 @@ bld.env.public_headers_allow_broken = True
TDB_LIB_SRC = '''
lib/dbwrap/dbwrap_open.c
lib/dbwrap_tdb.c
lib/dbwrap_ctdb.c
lib/dbwrap/dbwrap_tdb.c
lib/dbwrap/dbwrap_ctdb.c
lib/g_lock.c'''
TDB_VALIDATE_SRC = '''lib/tdb_validate.c'''
@ -1008,7 +1008,7 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
vars=locals())
bld.SAMBA3_LIBRARY('dbwrap',
source='lib/dbwrap.c lib/dbwrap_util.c lib/dbwrap_rbt.c',
source='lib/dbwrap/dbwrap.c lib/dbwrap/dbwrap_util.c lib/dbwrap/dbwrap_rbt.c',
deps='samba-util UTIL_TDB errors',
private_library=True)