summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-09-11 00:50:13 +0000
committerJeremy Allison <jra@samba.org>2002-09-11 00:50:13 +0000
commit6b956c8c1e55723788ede2cf9307456b38165a3b (patch)
treefc71188717c36962f2cea9a6b17efaa41fa1ca71
parent1bc851e3146627324734fc62e3ce13e680ae48ae (diff)
downloadsamba-6b956c8c1e55723788ede2cf9307456b38165a3b.tar.gz
samba-6b956c8c1e55723788ede2cf9307456b38165a3b.tar.bz2
samba-6b956c8c1e55723788ede2cf9307456b38165a3b.zip
Fix missing braces around push lock call.
Jeremy. (This used to be commit c93b40f43d5f5027f26c9b6bb906011a9075db2d)
-rw-r--r--source3/locking/locking.c2
-rw-r--r--source3/smbd/reply.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index d42d041b79..3eb7ca4783 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -142,7 +142,7 @@ static NTSTATUS do_lock(files_struct *fsp,connection_struct *conn, uint16 lock_p
}
/****************************************************************************
- Utility function called by locking requests. This is *DISGISTING*. It also
+ Utility function called by locking requests. This is *DISGUSTING*. It also
appears to be "What Windows Does" (tm). Andrew, ever wonder why Windows 2000
is so slow on the locking tests...... ? This is the reason. Much though I hate
it, we need this. JRA.
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 2b361fd43a..36f7c3a883 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1609,9 +1609,10 @@ int reply_lockread(connection_struct *conn, char *inbuf,char *outbuf, int length
* this smb into a queued request and push it
* onto the blocking lock queue.
*/
- if(push_blocking_lock_request(inbuf, length, -1, 0))
+ if(push_blocking_lock_request(inbuf, length, -1, 0)) {
END_PROFILE(SMBlockread);
- return -1;
+ return -1;
+ }
}
END_PROFILE(SMBlockread);
return ERROR_NT(status);