From effd4a33856bf315122df9e4fbbb241a161caa62 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 8 Jun 2004 22:13:59 +0000 Subject: r1089: Removed spurious oplock message in deferred open processing. Fix smb signing sequence counts. Jeremy. (This used to be commit 7e2a5c36614282b6bd50b60360f443549426dd4b) --- source3/smbd/process.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'source3/smbd/process.c') diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 698c8475f7..05e4d0b1d9 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -121,9 +121,6 @@ static BOOL push_queued_message(enum q_type qt, char *buf, int msg_len, struct t DLIST_ADD_END(smb_sharing_violation_queue, msg, tmp_msg); } - /* Push the MID of this packet on the signing queue. */ - srv_defer_sign_response(SVAL(buf,smb_mid)); - DEBUG(10,("push_message: pushed message length %u on queue %s\n", (unsigned int)msg_len, qt == OPLOCK_QUEUE ? "smb_oplock_queue" : "smb_sharing_violation_queue" )); @@ -138,7 +135,12 @@ static BOOL push_queued_message(enum q_type qt, char *buf, int msg_len, struct t BOOL push_oplock_pending_smb_message(char *buf, int msg_len) { - return push_queued_message(OPLOCK_QUEUE, buf, msg_len, NULL, NULL, 0); + BOOL ret = push_queued_message(OPLOCK_QUEUE, buf, msg_len, NULL, NULL, 0); + if (ret) { + /* Push the MID of this packet on the signing queue. */ + srv_defer_sign_response(SVAL(buf,smb_mid)); + } + return ret; } /**************************************************************************** -- cgit