[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Mon Feb 28 13:58:02 MST 2011
The branch, master has been updated
via b077ccc ntvfs: Add some missing dependencies on tevent/events.
via 1a6fd61 tevent: Add lib/tevent as include directory.
via 0bd390e samba_abi: Generate vscript entries even for ABI versions that didn't introduce any new symbols.
via 31d09b1 tdb: Use <tdb.h> to include tdb so system headers are found when building against system tdb.
via 136c160 Use <tdb.h> to include tdb, so the system include file gets used when building against system tdb.
via 4a42272 tdr: Inline proto header to allow tdr.h to be used as it's a public header.
via 21d926f Use <tevent.h> so the system tevent gets included, if enabled.
from 6e66208 Finish the range checking on all FD_SET calls for select().
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b077ccccfba22310862d6a600a41a6ab1130dc1a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 28 20:26:55 2011 +0100
ntvfs: Add some missing dependencies on tevent/events.
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Mon Feb 28 21:57:16 CET 2011 on sn-devel-104
commit 1a6fd61a412820ab0ac5d741824068c0457ac480
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 28 19:20:46 2011 +0100
tevent: Add lib/tevent as include directory.
commit 0bd390e706135fca80ce82e8b3cf3841d7f142fb
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 28 17:13:07 2011 +0100
samba_abi: Generate vscript entries even for ABI versions that didn't introduce
any new symbols.
The version entries also appear in the symbol table and removing them
(we always add an entry for the current version) breaks the ABI.
commit 31d09b13d3dc3aa204cf416bdf87eb39b7fe5de2
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Feb 27 20:45:42 2011 +0100
tdb: Use <tdb.h> to include tdb so system headers are found when building against system tdb.
commit 136c1600648f690d7709a204c4a7117bb5a868c3
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Feb 27 18:45:53 2011 +0100
Use <tdb.h> to include tdb, so the system include file gets used when building against
system tdb.
commit 4a42272f09aa52db8b1e11595b266d0ef8d4b041
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Feb 27 18:42:00 2011 +0100
tdr: Inline proto header to allow tdr.h to be used as it's a public header.
commit 21d926f0ef35eb3b34841d9d9606e8f819db9819
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Feb 27 18:39:10 2011 +0100
Use <tevent.h> so the system tevent gets included, if enabled.
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_abi.py | 31 ++++++++++++++-------
lib/crypto/md4test.c | 2 +-
lib/tdr/tdr.c | 2 +-
lib/tdr/tdr.h | 43 +++++++++++++++++++++++++++---
lib/tdr/wscript_build | 1 -
lib/tevent/wscript | 1 +
lib/util/tevent_unix.h | 2 +-
lib/util/util_runcmd.c | 4 +-
lib/util/util_tdb.c | 2 +-
source4/auth/credentials/pycredentials.h | 2 +-
source4/auth/pyauth.h | 2 +-
source4/cluster/local.c | 2 +-
source4/lib/events/events.h | 2 +-
source4/lib/ldb-samba/ldb_wrap.c | 2 +-
source4/lib/messaging/messaging.c | 2 +-
source4/lib/tdb_wrap.c | 4 +-
source4/lib/tdb_wrap.h | 2 +-
source4/ntvfs/common/brlock.c | 2 +-
source4/ntvfs/common/brlock_tdb.c | 2 +-
source4/ntvfs/common/notify.c | 2 +-
source4/ntvfs/common/opendb_tdb.c | 2 +-
source4/ntvfs/posix/vfs_posix.c | 2 +-
source4/ntvfs/posix/wscript_build | 7 +++--
source4/ntvfs/posix/xattr_tdb.c | 2 +-
source4/ntvfs/sysdep/sys_notify.c | 2 +-
source4/ntvfs/sysdep/wscript_build | 2 +-
source4/torture/basic/mangle_test.c | 2 +-
source4/torture/local/dbspeed.c | 2 +-
28 files changed, 90 insertions(+), 43 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
index ebd5210..396a7fc 100644
--- a/buildtools/wafsamba/samba_abi.py
+++ b/buildtools/wafsamba/samba_abi.py
@@ -145,8 +145,16 @@ def abi_process_file(fname, version, symmap):
symmap[symname] = version
f.close()
-def abi_write_vscript(vscript, libname, version, symmap, abi_match):
- '''write a vscript file for a library in --version-script format'''
+def abi_write_vscript(vscript, libname, current_version, versions, symmap, abi_match):
+ '''write a vscript file for a library in --version-script format
+
+ :param vscript: Path to the vscript file
+ :param libname: Name of the library, uppercased
+ :param current_version: Current version
+ :param versions: Versions to consider
+ :param symmap: Dictionary mapping symbols -> version
+ :param abi_match: List of symbols considered to be public in the current version
+ '''
invmap = {}
for s in symmap:
@@ -154,16 +162,18 @@ def abi_write_vscript(vscript, libname, version, symmap, abi_match):
f = open(vscript, mode='w')
last_key = ""
- for k in sorted(invmap):
+ for k in sorted(versions):
symver = "%s_%s" % (libname, k)
- if symver == version:
+ if symver == current_version:
break
- f.write("%s {\n\tglobal: \n" % symver)
- for s in invmap[k]:
- f.write("\t\t%s;\n" % s);
+ f.write("%s {\n" % symver)
+ if k in invmap:
+ f.write("\tglobal: \n")
+ for s in invmap.get(k, []):
+ f.write("\t\t%s;\n" % s);
f.write("}%s;\n\n" % last_key)
last_key = " %s" % symver
- f.write("%s {\n" % version)
+ f.write("%s {\n" % current_version)
f.write("\tglobal:\n")
for x in abi_match:
f.write("\t\t%s;\n" % x)
@@ -179,13 +189,14 @@ def abi_build_vscript(task):
tgt = task.outputs[0].bldpath(task.env)
symmap = {}
-
+ versions = []
for f in task.inputs:
fname = f.abspath(task.env)
basename = os.path.basename(fname)
version = basename[len(task.env.LIBNAME)+1:-len(".sigs")]
+ versions.append(version)
abi_process_file(fname, version, symmap)
- abi_write_vscript(tgt, task.env.LIBNAME, task.env.VERSION, symmap,
+ abi_write_vscript(tgt, task.env.LIBNAME, task.env.VERSION, versions, symmap,
task.env.ABI_MATCH)
diff --git a/lib/crypto/md4test.c b/lib/crypto/md4test.c
index e406c69..7516e82 100644
--- a/lib/crypto/md4test.c
+++ b/lib/crypto/md4test.c
@@ -26,7 +26,7 @@ struct torture_context;
/*
This uses the test values from rfc1320
*/
-bool torture_local_crypto_md4(struct torture_context *torture)
+bool torture_local_crypto_md4(struct torture_context *torture)
{
bool ret = true;
uint32_t i;
diff --git a/lib/tdr/tdr.c b/lib/tdr/tdr.c
index 9587104..ab016d0 100644
--- a/lib/tdr/tdr.c
+++ b/lib/tdr/tdr.c
@@ -387,7 +387,7 @@ NTSTATUS tdr_push_to_fd(int fd, tdr_push_fn_t push_fn, const void *p)
return NT_STATUS_OK;
}
-void tdr_print_debug_helper(struct tdr_print *tdr, const char *format, ...) _PRINTF_ATTRIBUTE(2,3)
+void tdr_print_debug_helper(struct tdr_print *tdr, const char *format, ...)
{
va_list ap;
char *s = NULL;
diff --git a/lib/tdr/tdr.h b/lib/tdr/tdr.h
index c3ffd2f..cd4785e 100644
--- a/lib/tdr/tdr.h
+++ b/lib/tdr/tdr.h
@@ -2,17 +2,17 @@
Unix SMB/CIFS implementation.
TDR definitions
Copyright (C) Jelmer Vernooij 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/>.
*/
@@ -60,6 +60,41 @@ struct tdr_print {
typedef NTSTATUS (*tdr_push_fn_t) (struct tdr_push *, const void *);
typedef NTSTATUS (*tdr_pull_fn_t) (struct tdr_pull *, TALLOC_CTX *, void *);
-#include "../lib/tdr/tdr_proto.h"
+NTSTATUS tdr_push_expand(struct tdr_push *tdr, uint32_t size);
+NTSTATUS tdr_pull_uint8(struct tdr_pull *tdr, TALLOC_CTX *ctx, uint8_t *v);
+NTSTATUS tdr_push_uint8(struct tdr_push *tdr, const uint8_t *v);
+NTSTATUS tdr_print_uint8(struct tdr_print *tdr, const char *name, uint8_t *v);
+NTSTATUS tdr_pull_uint16(struct tdr_pull *tdr, TALLOC_CTX *ctx, uint16_t *v);
+NTSTATUS tdr_pull_uint1632(struct tdr_pull *tdr, TALLOC_CTX *ctx, uint16_t *v);
+NTSTATUS tdr_push_uint16(struct tdr_push *tdr, const uint16_t *v);
+NTSTATUS tdr_push_uint1632(struct tdr_push *tdr, const uint16_t *v);
+NTSTATUS tdr_print_uint16(struct tdr_print *tdr, const char *name, uint16_t *v);
+NTSTATUS tdr_pull_uint32(struct tdr_pull *tdr, TALLOC_CTX *ctx, uint32_t *v);
+NTSTATUS tdr_push_uint32(struct tdr_push *tdr, const uint32_t *v);
+NTSTATUS tdr_print_uint32(struct tdr_print *tdr, const char *name, uint32_t *v);
+NTSTATUS tdr_pull_charset(struct tdr_pull *tdr, TALLOC_CTX *ctx, const char **v, uint32_t length, uint32_t el_size, charset_t chset);
+NTSTATUS tdr_push_charset(struct tdr_push *tdr, const char **v, uint32_t length, uint32_t el_size, charset_t chset);
+NTSTATUS tdr_print_charset(struct tdr_print *tdr, const char *name, const char **v, uint32_t length, uint32_t el_size, charset_t chset);
+
+NTSTATUS tdr_pull_hyper(struct tdr_pull *tdr, TALLOC_CTX *ctx, uint64_t *v);
+NTSTATUS tdr_push_hyper(struct tdr_push *tdr, uint64_t *v);
+
+NTSTATUS tdr_push_NTTIME(struct tdr_push *tdr, NTTIME *t);
+NTSTATUS tdr_pull_NTTIME(struct tdr_pull *tdr, TALLOC_CTX *ctx, NTTIME *t);
+NTSTATUS tdr_print_NTTIME(struct tdr_print *tdr, const char *name, NTTIME *t);
+
+NTSTATUS tdr_push_time_t(struct tdr_push *tdr, time_t *t);
+NTSTATUS tdr_pull_time_t(struct tdr_pull *tdr, TALLOC_CTX *ctx, time_t *t);
+NTSTATUS tdr_print_time_t(struct tdr_print *tdr, const char *name, time_t *t);
+
+NTSTATUS tdr_print_DATA_BLOB(struct tdr_print *tdr, const char *name, DATA_BLOB *r);
+NTSTATUS tdr_push_DATA_BLOB(struct tdr_push *tdr, DATA_BLOB *blob);
+NTSTATUS tdr_pull_DATA_BLOB(struct tdr_pull *tdr, TALLOC_CTX *ctx, DATA_BLOB *blob);
+
+struct tdr_push *tdr_push_init(TALLOC_CTX *mem_ctx);
+struct tdr_pull *tdr_pull_init(TALLOC_CTX *mem_ctx);
+
+NTSTATUS tdr_push_to_fd(int fd, tdr_push_fn_t push_fn, const void *p);
+void tdr_print_debug_helper(struct tdr_print *tdr, const char *format, ...) _PRINTF_ATTRIBUTE(2,3);
#endif /* __TDR_H__ */
diff --git a/lib/tdr/wscript_build b/lib/tdr/wscript_build
index 431ac53..67fdfeb 100644
--- a/lib/tdr/wscript_build
+++ b/lib/tdr/wscript_build
@@ -3,7 +3,6 @@
bld.SAMBA_SUBSYSTEM('TDR',
source='tdr.c',
- autoproto='tdr_proto.h',
public_deps='talloc samba-util',
public_headers='tdr.h'
)
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index b82a41f..07143c1 100644
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -80,6 +80,7 @@ def build(bld):
SRC,
deps='replace talloc',
enabled= not bld.CONFIG_SET('USING_SYSTEM_TEVENT'),
+ includes='.',
abi_directory='ABI',
abi_match='tevent_* _tevent_*',
vnum=VERSION,
diff --git a/lib/util/tevent_unix.h b/lib/util/tevent_unix.h
index bc2cea9..377e976 100644
--- a/lib/util/tevent_unix.h
+++ b/lib/util/tevent_unix.h
@@ -24,7 +24,7 @@
#ifndef _TEVENT_UNIX_H
#define _TEVENT_UNIX_H
-#include "../tevent/tevent.h"
+#include <tevent.h>
bool tevent_req_is_unix_error(struct tevent_req *req, int *perrno);
diff --git a/lib/util/util_runcmd.c b/lib/util/util_runcmd.c
index aa2a3e6..d617254 100644
--- a/lib/util/util_runcmd.c
+++ b/lib/util/util_runcmd.c
@@ -27,8 +27,8 @@
#include "includes.h"
#include "system/filesys.h"
-#include "lib/tevent/tevent.h"
-#include "lib/util/tevent_unix.h"
+#include <tevent.h>
+#include "../lib/util/tevent_unix.h"
struct samba_runcmd_state {
int stdout_log_level;
diff --git a/lib/util/util_tdb.c b/lib/util/util_tdb.c
index 8973b9b..4a81678 100644
--- a/lib/util/util_tdb.c
+++ b/lib/util/util_tdb.c
@@ -20,7 +20,7 @@
*/
#include "includes.h"
-#include "tdb.h"
+#include <tdb.h>
#include "../lib/util/util_tdb.h"
/* these are little tdb utility functions that are meant to make
diff --git a/source4/auth/credentials/pycredentials.h b/source4/auth/credentials/pycredentials.h
index 5c3a9b2..451ade6 100644
--- a/source4/auth/credentials/pycredentials.h
+++ b/source4/auth/credentials/pycredentials.h
@@ -20,7 +20,7 @@
#define _PYCREDENTIALS_H_
#include "auth/credentials/credentials.h"
-#include "lib/talloc/pytalloc.h"
+#include <pytalloc.h>
extern PyTypeObject PyCredentials;
extern PyTypeObject PyCredentialCacheContainer;
diff --git a/source4/auth/pyauth.h b/source4/auth/pyauth.h
index 2d0379e..38fd2a5 100644
--- a/source4/auth/pyauth.h
+++ b/source4/auth/pyauth.h
@@ -20,7 +20,7 @@
#ifndef _PYAUTH_H_
#define _PYAUTH_H_
-#include "lib/talloc/pytalloc.h"
+#include <pytalloc.h>
#include "auth/session.h"
#define PyAuthSession_AsSession(obj) py_talloc_get_type(obj, struct auth_session_info)
diff --git a/source4/cluster/local.c b/source4/cluster/local.c
index 2d910d1..a93b0a6 100644
--- a/source4/cluster/local.c
+++ b/source4/cluster/local.c
@@ -22,7 +22,7 @@
#include "includes.h"
#include "cluster/cluster.h"
#include "cluster/cluster_private.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
#include "tdb_wrap.h"
#include "system/filesys.h"
#include "param/param.h"
diff --git a/source4/lib/events/events.h b/source4/lib/events/events.h
index 5fdb967..f666988 100644
--- a/source4/lib/events/events.h
+++ b/source4/lib/events/events.h
@@ -1,7 +1,7 @@
#ifndef __LIB_EVENTS_H__
#define __LIB_EVENTS_H__
#define TEVENT_COMPAT_DEFINES 1
-#include <../lib/tevent/tevent.h>
+#include <tevent.h>
struct tevent_context *s4_event_context_init(TALLOC_CTX *mem_ctx);
struct tevent_context *event_context_find(TALLOC_CTX *mem_ctx) _DEPRECATED_;
void s4_event_context_set_default(struct tevent_context *ev);
diff --git a/source4/lib/ldb-samba/ldb_wrap.c b/source4/lib/ldb-samba/ldb_wrap.c
index e3e6dce..7dcf514 100644
--- a/source4/lib/ldb-samba/ldb_wrap.c
+++ b/source4/lib/ldb-samba/ldb_wrap.c
@@ -35,7 +35,7 @@
#include "dsdb/samdb/samdb.h"
#include "param/param.h"
#include "../lib/util/dlinklist.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
/*
this is used to catch debug messages from ldb
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index c61bb7a..f9d6320 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -30,7 +30,7 @@
#include "tdb_wrap.h"
#include "../lib/util/unix_privs.h"
#include "librpc/rpc/dcerpc.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
#include "../lib/util/util_tdb.h"
#include "cluster/cluster.h"
#include "../lib/util/tevent_ntstatus.h"
diff --git a/source4/lib/tdb_wrap.c b/source4/lib/tdb_wrap.c
index da27803..97294e1 100644
--- a/source4/lib/tdb_wrap.c
+++ b/source4/lib/tdb_wrap.c
@@ -20,10 +20,10 @@
*/
#include "includes.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
#include "../lib/util/dlinklist.h"
#include "tdb_wrap.h"
-#include "tdb.h"
+#include <tdb.h>
static struct tdb_wrap *tdb_list;
diff --git a/source4/lib/tdb_wrap.h b/source4/lib/tdb_wrap.h
index d49fafb..94035c1 100644
--- a/source4/lib/tdb_wrap.h
+++ b/source4/lib/tdb_wrap.h
@@ -29,7 +29,7 @@
#ifndef _TDB_WRAP_H_
#define _TDB_WRAP_H_
-#include "../lib/tdb/include/tdb.h"
+#include <tdb.h>
struct tdb_wrap {
struct tdb_context *tdb;
diff --git a/source4/ntvfs/common/brlock.c b/source4/ntvfs/common/brlock.c
index 154494e..94041d2 100644
--- a/source4/ntvfs/common/brlock.c
+++ b/source4/ntvfs/common/brlock.c
@@ -26,7 +26,7 @@
#include "includes.h"
#include "system/filesys.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
#include "messaging/messaging.h"
#include "lib/messaging/irpc.h"
#include "libcli/libcli.h"
diff --git a/source4/ntvfs/common/brlock_tdb.c b/source4/ntvfs/common/brlock_tdb.c
index 07e7c1a..35d4c27 100644
--- a/source4/ntvfs/common/brlock_tdb.c
+++ b/source4/ntvfs/common/brlock_tdb.c
@@ -26,7 +26,7 @@
#include "includes.h"
#include "system/filesys.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
#include "messaging/messaging.h"
#include "tdb_wrap.h"
#include "lib/messaging/irpc.h"
diff --git a/source4/ntvfs/common/notify.c b/source4/ntvfs/common/notify.c
index e369404..0b5f91b 100644
--- a/source4/ntvfs/common/notify.c
+++ b/source4/ntvfs/common/notify.c
@@ -25,7 +25,7 @@
#include "includes.h"
#include "system/filesys.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
#include "../lib/util/util_tdb.h"
#include "messaging/messaging.h"
#include "tdb_wrap.h"
diff --git a/source4/ntvfs/common/opendb_tdb.c b/source4/ntvfs/common/opendb_tdb.c
index 944ec86..881fd5b 100644
--- a/source4/ntvfs/common/opendb_tdb.c
+++ b/source4/ntvfs/common/opendb_tdb.c
@@ -40,7 +40,7 @@
#include "includes.h"
#include "system/filesys.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
#include "messaging/messaging.h"
#include "tdb_wrap.h"
#include "lib/messaging/irpc.h"
diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c
index 1e0efcd..ca1d163 100644
--- 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/include/tdb.h"
+#include <tdb.h>
#include "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 5945ed9..d4e4d4a 100644
--- a/source4/ntvfs/posix/wscript_build
+++ b/source4/ntvfs/posix/wscript_build
@@ -2,7 +2,8 @@
bld.SAMBA_SUBSYSTEM('pvfs_acl',
source='pvfs_acl.c',
- autoproto='vfs_acl_proto.h'
+ autoproto='vfs_acl_proto.h',
+ deps='events',
)
@@ -10,7 +11,7 @@ bld.SAMBA_MODULE('pvfs_acl_xattr',
source='pvfs_acl_xattr.c',
subsystem='pvfs_acl',
init_function='pvfs_acl_xattr_init',
- deps='NDR_XATTR'
+ deps='NDR_XATTR events'
)
@@ -18,7 +19,7 @@ bld.SAMBA_MODULE('pvfs_acl_nfs4',
source='pvfs_acl_nfs4.c',
subsystem='pvfs_acl',
init_function='pvfs_acl_nfs4_init',
- deps='NDR_NFS4ACL samdb'
+ deps='NDR_NFS4ACL samdb events'
)
diff --git a/source4/ntvfs/posix/xattr_tdb.c b/source4/ntvfs/posix/xattr_tdb.c
index 69324a3..de7c836 100644
--- a/source4/ntvfs/posix/xattr_tdb.c
+++ b/source4/ntvfs/posix/xattr_tdb.c
@@ -21,7 +21,7 @@
#include "includes.h"
#include "tdb_wrap.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
#include "vfs_posix.h"
#define XATTR_LIST_ATTR ".xattr_list"
diff --git a/source4/ntvfs/sysdep/sys_notify.c b/source4/ntvfs/sysdep/sys_notify.c
index 72509e6..03679b6 100644
--- a/source4/ntvfs/sysdep/sys_notify.c
+++ b/source4/ntvfs/sysdep/sys_notify.c
@@ -25,7 +25,7 @@
#include "includes.h"
#include "system/filesys.h"
#include "ntvfs/sysdep/sys_notify.h"
-#include "../lib/tevent/tevent.h"
+#include <tevent.h>
#include "../lib/util/dlinklist.h"
#include "param/param.h"
diff --git a/source4/ntvfs/sysdep/wscript_build b/source4/ntvfs/sysdep/wscript_build
index 105209b..d8d5b55 100644
--- a/source4/ntvfs/sysdep/wscript_build
+++ b/source4/ntvfs/sysdep/wscript_build
@@ -11,7 +11,7 @@ bld.SAMBA_MODULE('sys_notify_inotify',
bld.SAMBA_SUBSYSTEM('sys_notify',
source='sys_notify.c',
- deps='talloc'
+ deps='talloc tevent'
)
diff --git a/source4/torture/basic/mangle_test.c b/source4/torture/basic/mangle_test.c
index 0f38c9f..1305634 100644
--- 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 "../tdb/include/tdb.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 9d7c551..8768b34 100644
--- 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/include/tdb.h"
+#include <tdb.h>
#include <ldb.h>
#include <ldb_errors.h>
#include "ldb_wrap.h"
--
Samba Shared Repository
More information about the samba-cvs
mailing list