svn commit: samba r10496 - in branches/SAMBA_4_0/source/lib/tdb: . common

[tridge at samba.org]

Author: tridge
Date: 2005-09-26 02:03:06 +0000 (Mon, 26 Sep 2005)
New Revision: 10496

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10496

Log:
- added configure test for sys/time.h

- print length of failed locks

Modified:
   branches/SAMBA_4_0/source/lib/tdb/common/lock.c
   branches/SAMBA_4_0/source/lib/tdb/config.m4


Changeset:
Modified: branches/SAMBA_4_0/source/lib/tdb/common/lock.c
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/common/lock.c	2005-09-26 01:46:02 UTC (rev 10495)
+++ branches/SAMBA_4_0/source/lib/tdb/common/lock.c	2005-09-26 02:03:06 UTC (rev 10496)
@@ -68,8 +68,8 @@
 		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);
 	}

Modified: branches/SAMBA_4_0/source/lib/tdb/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/config.m4	2005-09-26 01:46:02 UTC (rev 10495)
+++ branches/SAMBA_4_0/source/lib/tdb/config.m4	2005-09-26 02:03:06 UTC (rev 10496)
@@ -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])