summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-05-04 21:57:28 +0000
committerJeremy Allison <jra@samba.org>2000-05-04 21:57:28 +0000
commit045469493c2870cb1d63c964b18afc5e2210dcd5 (patch)
tree5faf23220fe5a8cfc136689e49951ddbbf2690ff /source3/smbd
parentfffeaf527d82b3535938cb89da7f4aa5ab8edc48 (diff)
downloadsamba-045469493c2870cb1d63c964b18afc5e2210dcd5.tar.gz
samba-045469493c2870cb1d63c964b18afc5e2210dcd5.tar.bz2
samba-045469493c2870cb1d63c964b18afc5e2210dcd5.zip
rpc_server/srv_lsa.c: Bring into sync with 2.0.x.
rpc_server/srv_pipe_hnd.c: Bring into sync with 2.0.x. smbd/blocking.c: Improve blocking debug reporting. utils/torture.c: Added check for NT locking bug. Jeremy. (This used to be commit e8ff6d3fb5537c39611a5784bf7216ae812acd27)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/blocking.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index ddf7de3f5b..e8dc29f80a 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -117,8 +117,8 @@ BOOL push_blocking_lock_request( char *inbuf, int length, int lock_timeout, int
ubi_slAddTail(&blocking_lock_queue, blr);
- DEBUG(3,("push_blocking_lock_request: lock request length=%d blocked with expiry time %d \
-for fnum = %d, name = %s\n", length, (int)blr->expire_time,
+ DEBUG(3,("push_blocking_lock_request: lock request length=%d blocked with expiry time %d (+%d) \
+for fnum = %d, name = %s\n", length, (int)blr->expire_time, lock_timeout,
blr->fsp->fnum, blr->fsp->fsp_name ));
return True;