mirror of
https://github.com/samba-team/samba.git
synced 2025-01-13 13:18:06 +03:00
Ensure everywhere we defer an incoming SMB request (blocking lock queue,
in oplock break state, change notify queue) we also push the MID onto
the deferred signing queue. Tomorrow I will test this with valgrind and
oplock tests.
Jeremy.
(This used to be commit 33a377f372
)
This commit is contained in:
parent
08634e26e4
commit
0c9433c031
@ -127,8 +127,7 @@ BOOL push_blocking_lock_request( char *inbuf, int length, int lock_timeout,
|
||||
/* Add a pending lock record for this. */
|
||||
status = brl_lock(blr->fsp->dev, blr->fsp->inode, blr->fsp->fnum,
|
||||
lock_pid, sys_getpid(), blr->fsp->conn->cnum,
|
||||
offset, count,
|
||||
PENDING_LOCK);
|
||||
offset, count, PENDING_LOCK);
|
||||
|
||||
if (!NT_STATUS_IS_OK(status)) {
|
||||
DEBUG(0,("push_blocking_lock_request: failed to add PENDING_LOCK record.\n"));
|
||||
@ -148,6 +147,9 @@ BOOL push_blocking_lock_request( char *inbuf, int length, int lock_timeout,
|
||||
for fnum = %d, name = %s\n", length, (int)blr->expire_time, lock_timeout,
|
||||
blr->fsp->fnum, blr->fsp->fsp_name ));
|
||||
|
||||
/* Push the MID of this packet on the signing queue. */
|
||||
srv_defer_sign_response(SVAL(inbuf,smb_mid));
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
|
@ -197,6 +197,9 @@ BOOL change_notify_set(char *inbuf, files_struct *fsp, connection_struct *conn,
|
||||
|
||||
DLIST_ADD(change_notify_list, cnbp);
|
||||
|
||||
/* Push the MID of this packet on the signing queue. */
|
||||
srv_defer_sign_response(SVAL(inbuf,smb_mid));
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
|
@ -1494,8 +1494,6 @@ static int call_nt_transact_notify_change(connection_struct *conn, char *inbuf,
|
||||
DEBUG(3,("call_nt_transact_notify_change: notify change called on directory \
|
||||
name = %s\n", fsp->fsp_name ));
|
||||
|
||||
srv_defer_sign_response(SVAL(inbuf,smb_mid));
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -87,6 +87,9 @@ static BOOL push_message(ubi_slList *list_head, char *buf, int msg_len)
|
||||
|
||||
ubi_slAddTail( list_head, msg);
|
||||
|
||||
/* Push the MID of this packet on the signing queue. */
|
||||
srv_defer_sign_response(SVAL(buf,smb_mid));
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user