diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-09-26 02:03:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:38:56 -0500 |
| commit | 3545e513f53340c504e55e5f496ad3067989ab09 (patch) | |
| tree | 4ad66821cb7268fd75c05a327e793ae9c8efc69a /source4/lib | |
| parent | f2e9db908a88b94fcf642b96382072d0de9009d1 (diff) | |
| download | samba-3545e513f53340c504e55e5f496ad3067989ab09.tar.gz samba-3545e513f53340c504e55e5f496ad3067989ab09.tar.bz2 samba-3545e513f53340c504e55e5f496ad3067989ab09.zip | |
r10496: - added configure test for sys/time.h
- print length of failed locks
(This used to be commit 11739ad31d7b3e1cf94ebf395608647e341257c4)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/tdb/common/lock.c | 4 | ||||
| -rw-r--r-- | source4/lib/tdb/config.m4 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/tdb/common/lock.c b/source4/lib/tdb/common/lock.c index 750d34ea31..976cf2cfa0 100644 --- a/source4/lib/tdb/common/lock.c +++ b/source4/lib/tdb/common/lock.c @@ -68,8 +68,8 @@ int tdb_brlock_len(struct tdb_context *tdb, tdb_off_t offset, if (!probe && lck_type != F_SETLK) { /* Ensure error code is set for log fun to examine. */ tdb->ecode = TDB_ERR_LOCK; - TDB_LOG((tdb, 5,"tdb_brlock failed (fd=%d) at offset %d rw_type=%d lck_type=%d\n", - tdb->fd, offset, rw_type, lck_type)); + TDB_LOG((tdb, 5,"tdb_brlock failed (fd=%d) at offset %d rw_type=%d lck_type=%d len=%d\n", + tdb->fd, offset, rw_type, lck_type, len)); } return TDB_ERRCODE(TDB_ERR_LOCK, -1); } diff --git a/source4/lib/tdb/config.m4 b/source4/lib/tdb/config.m4 index e37662fe52..23784f3723 100644 --- a/source4/lib/tdb/config.m4 +++ b/source4/lib/tdb/config.m4 @@ -1,5 +1,5 @@ AC_CHECK_FUNCS(mmap pread pwrite getpagesize) -AC_CHECK_HEADERS(getopt.h sys/select.h) +AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h) AC_DEFINE([_GNU_SOURCE],[],[Pull in GNU extensions]) |