mirror of
https://github.com/samba-team/samba.git
synced 2025-01-12 09:18:10 +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:
Jeremy Allison
parent
08634e26e4
commit
0c9433c031
@ -28,16 +28,16 @@ extern char *OutBuffer;
|
||||
*****************************************************************************/
|
||||
|
||||
typedef struct {
|
||||
ubi_slNode msg_next;
|
||||
int com_type;
|
||||
files_struct *fsp;
|
||||
time_t expire_time;
|
||||
int lock_num;
|
||||
SMB_BIG_UINT offset;
|
||||
SMB_BIG_UINT count;
|
||||
uint16 lock_pid;
|
||||
char *inbuf;
|
||||
int length;
|
||||
ubi_slNode msg_next;
|
||||
int com_type;
|
||||
files_struct *fsp;
|
||||
time_t expire_time;
|
||||
int lock_num;
|
||||
SMB_BIG_UINT offset;
|
||||
SMB_BIG_UINT count;
|
||||
uint16 lock_pid;
|
||||
char *inbuf;
|
||||
int length;
|
||||
} blocking_lock_record;
|
||||
|
||||
static ubi_slList blocking_lock_queue = { NULL, (ubi_slNodePtr)&blocking_lock_queue, 0};
|
||||
@ -48,8 +48,8 @@ static ubi_slList blocking_lock_queue = { NULL, (ubi_slNodePtr)&blocking_lock_qu
|
||||
|
||||
static void free_blocking_lock_record(blocking_lock_record *blr)
|
||||
{
|
||||
SAFE_FREE(blr->inbuf);
|
||||
SAFE_FREE(blr);
|
||||
SAFE_FREE(blr->inbuf);
|
||||
SAFE_FREE(blr);
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
@ -58,17 +58,17 @@ static void free_blocking_lock_record(blocking_lock_record *blr)
|
||||
|
||||
static files_struct *get_fsp_from_pkt(char *inbuf)
|
||||
{
|
||||
switch(CVAL(inbuf,smb_com)) {
|
||||
case SMBlock:
|
||||
case SMBlockread:
|
||||
return file_fsp(inbuf,smb_vwv0);
|
||||
case SMBlockingX:
|
||||
return file_fsp(inbuf,smb_vwv2);
|
||||
default:
|
||||
DEBUG(0,("get_fsp_from_pkt: PANIC - unknown type on blocking lock queue - exiting.!\n"));
|
||||
exit_server("PANIC - unknown type on blocking lock queue");
|
||||
}
|
||||
return NULL; /* Keep compiler happy. */
|
||||
switch(CVAL(inbuf,smb_com)) {
|
||||
case SMBlock:
|
||||
case SMBlockread:
|
||||
return file_fsp(inbuf,smb_vwv0);
|
||||
case SMBlockingX:
|
||||
return file_fsp(inbuf,smb_vwv2);
|
||||
default:
|
||||
DEBUG(0,("get_fsp_from_pkt: PANIC - unknown type on blocking lock queue - exiting.!\n"));
|
||||
exit_server("PANIC - unknown type on blocking lock queue");
|
||||
}
|
||||
return NULL; /* Keep compiler happy. */
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
@ -77,7 +77,7 @@ static files_struct *get_fsp_from_pkt(char *inbuf)
|
||||
|
||||
static BOOL in_chained_smb(void)
|
||||
{
|
||||
return (chain_size != 0);
|
||||
return (chain_size != 0);
|
||||
}
|
||||
|
||||
static void received_unlock_msg(int msg_type, pid_t src, void *buf, size_t len);
|
||||
@ -89,66 +89,68 @@ static void received_unlock_msg(int msg_type, pid_t src, void *buf, size_t len);
|
||||
BOOL push_blocking_lock_request( char *inbuf, int length, int lock_timeout,
|
||||
int lock_num, uint16 lock_pid, SMB_BIG_UINT offset, SMB_BIG_UINT count)
|
||||
{
|
||||
static BOOL set_lock_msg;
|
||||
blocking_lock_record *blr;
|
||||
NTSTATUS status;
|
||||
static BOOL set_lock_msg;
|
||||
blocking_lock_record *blr;
|
||||
NTSTATUS status;
|
||||
|
||||
if(in_chained_smb() ) {
|
||||
DEBUG(0,("push_blocking_lock_request: cannot queue a chained request (currently).\n"));
|
||||
return False;
|
||||
}
|
||||
if(in_chained_smb() ) {
|
||||
DEBUG(0,("push_blocking_lock_request: cannot queue a chained request (currently).\n"));
|
||||
return False;
|
||||
}
|
||||
|
||||
/*
|
||||
* Now queue an entry on the blocking lock queue. We setup
|
||||
* the expiration time here.
|
||||
*/
|
||||
/*
|
||||
* Now queue an entry on the blocking lock queue. We setup
|
||||
* the expiration time here.
|
||||
*/
|
||||
|
||||
if((blr = (blocking_lock_record *)malloc(sizeof(blocking_lock_record))) == NULL) {
|
||||
DEBUG(0,("push_blocking_lock_request: Malloc fail !\n" ));
|
||||
return False;
|
||||
}
|
||||
if((blr = (blocking_lock_record *)malloc(sizeof(blocking_lock_record))) == NULL) {
|
||||
DEBUG(0,("push_blocking_lock_request: Malloc fail !\n" ));
|
||||
return False;
|
||||
}
|
||||
|
||||
if((blr->inbuf = (char *)malloc(length)) == NULL) {
|
||||
DEBUG(0,("push_blocking_lock_request: Malloc fail (2)!\n" ));
|
||||
SAFE_FREE(blr);
|
||||
return False;
|
||||
}
|
||||
if((blr->inbuf = (char *)malloc(length)) == NULL) {
|
||||
DEBUG(0,("push_blocking_lock_request: Malloc fail (2)!\n" ));
|
||||
SAFE_FREE(blr);
|
||||
return False;
|
||||
}
|
||||
|
||||
blr->com_type = CVAL(inbuf,smb_com);
|
||||
blr->fsp = get_fsp_from_pkt(inbuf);
|
||||
blr->expire_time = (lock_timeout == -1) ? (time_t)-1 : time(NULL) + (time_t)lock_timeout;
|
||||
blr->lock_num = lock_num;
|
||||
blr->lock_pid = lock_pid;
|
||||
blr->offset = offset;
|
||||
blr->count = count;
|
||||
memcpy(blr->inbuf, inbuf, length);
|
||||
blr->length = length;
|
||||
blr->com_type = CVAL(inbuf,smb_com);
|
||||
blr->fsp = get_fsp_from_pkt(inbuf);
|
||||
blr->expire_time = (lock_timeout == -1) ? (time_t)-1 : time(NULL) + (time_t)lock_timeout;
|
||||
blr->lock_num = lock_num;
|
||||
blr->lock_pid = lock_pid;
|
||||
blr->offset = offset;
|
||||
blr->count = count;
|
||||
memcpy(blr->inbuf, inbuf, length);
|
||||
blr->length = length;
|
||||
|
||||
/* 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);
|
||||
/* 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);
|
||||
|
||||
if (!NT_STATUS_IS_OK(status)) {
|
||||
DEBUG(0,("push_blocking_lock_request: failed to add PENDING_LOCK record.\n"));
|
||||
free_blocking_lock_record(blr);
|
||||
return False;
|
||||
}
|
||||
if (!NT_STATUS_IS_OK(status)) {
|
||||
DEBUG(0,("push_blocking_lock_request: failed to add PENDING_LOCK record.\n"));
|
||||
free_blocking_lock_record(blr);
|
||||
return False;
|
||||
}
|
||||
|
||||
ubi_slAddTail(&blocking_lock_queue, blr);
|
||||
ubi_slAddTail(&blocking_lock_queue, blr);
|
||||
|
||||
/* Ensure we'll receive messages when this is unlocked. */
|
||||
if (!set_lock_msg) {
|
||||
message_register(MSG_SMB_UNLOCK, received_unlock_msg);
|
||||
set_lock_msg = True;
|
||||
}
|
||||
/* Ensure we'll receive messages when this is unlocked. */
|
||||
if (!set_lock_msg) {
|
||||
message_register(MSG_SMB_UNLOCK, received_unlock_msg);
|
||||
set_lock_msg = True;
|
||||
}
|
||||
|
||||
DEBUG(3,("push_blocking_lock_request: lock request length=%d blocked with expiry time %d (+%d) \
|
||||
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 ));
|
||||
blr->fsp->fnum, blr->fsp->fsp_name ));
|
||||
|
||||
return True;
|
||||
/* Push the MID of this packet on the signing queue. */
|
||||
srv_defer_sign_response(SVAL(inbuf,smb_mid));
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
@ -170,27 +172,27 @@ static void send_blocking_reply(char *outbuf, int outsize)
|
||||
|
||||
static void reply_lockingX_success(blocking_lock_record *blr)
|
||||
{
|
||||
char *outbuf = OutBuffer;
|
||||
int bufsize = BUFFER_SIZE;
|
||||
char *inbuf = blr->inbuf;
|
||||
int outsize = 0;
|
||||
char *outbuf = OutBuffer;
|
||||
int bufsize = BUFFER_SIZE;
|
||||
char *inbuf = blr->inbuf;
|
||||
int outsize = 0;
|
||||
|
||||
construct_reply_common(inbuf, outbuf);
|
||||
set_message(outbuf,2,0,True);
|
||||
construct_reply_common(inbuf, outbuf);
|
||||
set_message(outbuf,2,0,True);
|
||||
|
||||
/*
|
||||
* As this message is a lockingX call we must handle
|
||||
* any following chained message correctly.
|
||||
* This is normally handled in construct_reply(),
|
||||
* but as that calls switch_message, we can't use
|
||||
* that here and must set up the chain info manually.
|
||||
*/
|
||||
/*
|
||||
* As this message is a lockingX call we must handle
|
||||
* any following chained message correctly.
|
||||
* This is normally handled in construct_reply(),
|
||||
* but as that calls switch_message, we can't use
|
||||
* that here and must set up the chain info manually.
|
||||
*/
|
||||
|
||||
outsize = chain_reply(inbuf,outbuf,blr->length,bufsize);
|
||||
outsize = chain_reply(inbuf,outbuf,blr->length,bufsize);
|
||||
|
||||
outsize += chain_size;
|
||||
outsize += chain_size;
|
||||
|
||||
send_blocking_reply(outbuf,outsize);
|
||||
send_blocking_reply(outbuf,outsize);
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
@ -492,18 +494,18 @@ Waiting....\n",
|
||||
|
||||
static BOOL blocking_lock_record_process(blocking_lock_record *blr)
|
||||
{
|
||||
switch(blr->com_type) {
|
||||
case SMBlock:
|
||||
return process_lock(blr);
|
||||
case SMBlockread:
|
||||
return process_lockread(blr);
|
||||
case SMBlockingX:
|
||||
return process_lockingX(blr);
|
||||
default:
|
||||
DEBUG(0,("blocking_lock_record_process: PANIC - unknown type on blocking lock queue - exiting.!\n"));
|
||||
exit_server("PANIC - unknown type on blocking lock queue");
|
||||
}
|
||||
return False; /* Keep compiler happy. */
|
||||
switch(blr->com_type) {
|
||||
case SMBlock:
|
||||
return process_lock(blr);
|
||||
case SMBlockread:
|
||||
return process_lockread(blr);
|
||||
case SMBlockingX:
|
||||
return process_lockingX(blr);
|
||||
default:
|
||||
DEBUG(0,("blocking_lock_record_process: PANIC - unknown type on blocking lock queue - exiting.!\n"));
|
||||
exit_server("PANIC - unknown type on blocking lock queue");
|
||||
}
|
||||
return False; /* Keep compiler happy. */
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
@ -512,27 +514,27 @@ static BOOL blocking_lock_record_process(blocking_lock_record *blr)
|
||||
|
||||
void remove_pending_lock_requests_by_fid(files_struct *fsp)
|
||||
{
|
||||
blocking_lock_record *blr = (blocking_lock_record *)ubi_slFirst( &blocking_lock_queue );
|
||||
blocking_lock_record *prev = NULL;
|
||||
blocking_lock_record *blr = (blocking_lock_record *)ubi_slFirst( &blocking_lock_queue );
|
||||
blocking_lock_record *prev = NULL;
|
||||
|
||||
while(blr != NULL) {
|
||||
if(blr->fsp->fnum == fsp->fnum) {
|
||||
while(blr != NULL) {
|
||||
if(blr->fsp->fnum == fsp->fnum) {
|
||||
|
||||
DEBUG(10,("remove_pending_lock_requests_by_fid - removing request type %d for \
|
||||
DEBUG(10,("remove_pending_lock_requests_by_fid - removing request type %d for \
|
||||
file %s fnum = %d\n", blr->com_type, fsp->fsp_name, fsp->fnum ));
|
||||
|
||||
brl_unlock(blr->fsp->dev, blr->fsp->inode, blr->fsp->fnum,
|
||||
blr->lock_pid, sys_getpid(), blr->fsp->conn->cnum,
|
||||
blr->offset, blr->count, True, NULL, NULL);
|
||||
brl_unlock(blr->fsp->dev, blr->fsp->inode, blr->fsp->fnum,
|
||||
blr->lock_pid, sys_getpid(), blr->fsp->conn->cnum,
|
||||
blr->offset, blr->count, True, NULL, NULL);
|
||||
|
||||
free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
|
||||
blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
|
||||
continue;
|
||||
}
|
||||
free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
|
||||
blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
|
||||
continue;
|
||||
}
|
||||
|
||||
prev = blr;
|
||||
blr = (blocking_lock_record *)ubi_slNext(blr);
|
||||
}
|
||||
prev = blr;
|
||||
blr = (blocking_lock_record *)ubi_slNext(blr);
|
||||
}
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
@ -541,28 +543,28 @@ file %s fnum = %d\n", blr->com_type, fsp->fsp_name, fsp->fnum ));
|
||||
|
||||
void remove_pending_lock_requests_by_mid(int mid)
|
||||
{
|
||||
blocking_lock_record *blr = (blocking_lock_record *)ubi_slFirst( &blocking_lock_queue );
|
||||
blocking_lock_record *prev = NULL;
|
||||
blocking_lock_record *blr = (blocking_lock_record *)ubi_slFirst( &blocking_lock_queue );
|
||||
blocking_lock_record *prev = NULL;
|
||||
|
||||
while(blr != NULL) {
|
||||
if(SVAL(blr->inbuf,smb_mid) == mid) {
|
||||
files_struct *fsp = blr->fsp;
|
||||
while(blr != NULL) {
|
||||
if(SVAL(blr->inbuf,smb_mid) == mid) {
|
||||
files_struct *fsp = blr->fsp;
|
||||
|
||||
DEBUG(10,("remove_pending_lock_requests_by_mid - removing request type %d for \
|
||||
DEBUG(10,("remove_pending_lock_requests_by_mid - removing request type %d for \
|
||||
file %s fnum = %d\n", blr->com_type, fsp->fsp_name, fsp->fnum ));
|
||||
|
||||
blocking_lock_reply_error(blr,NT_STATUS_CANCELLED);
|
||||
brl_unlock(blr->fsp->dev, blr->fsp->inode, blr->fsp->fnum,
|
||||
blr->lock_pid, sys_getpid(), blr->fsp->conn->cnum,
|
||||
blr->offset, blr->count, True, NULL, NULL);
|
||||
free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
|
||||
blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
|
||||
continue;
|
||||
}
|
||||
blocking_lock_reply_error(blr,NT_STATUS_CANCELLED);
|
||||
brl_unlock(blr->fsp->dev, blr->fsp->inode, blr->fsp->fnum,
|
||||
blr->lock_pid, sys_getpid(), blr->fsp->conn->cnum,
|
||||
blr->offset, blr->count, True, NULL, NULL);
|
||||
free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
|
||||
blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
|
||||
continue;
|
||||
}
|
||||
|
||||
prev = blr;
|
||||
blr = (blocking_lock_record *)ubi_slNext(blr);
|
||||
}
|
||||
prev = blr;
|
||||
blr = (blocking_lock_record *)ubi_slNext(blr);
|
||||
}
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
@ -611,112 +613,112 @@ unsigned blocking_locks_timeout(unsigned default_timeout)
|
||||
|
||||
void process_blocking_lock_queue(time_t t)
|
||||
{
|
||||
blocking_lock_record *blr = (blocking_lock_record *)ubi_slFirst( &blocking_lock_queue );
|
||||
blocking_lock_record *prev = NULL;
|
||||
blocking_lock_record *blr = (blocking_lock_record *)ubi_slFirst( &blocking_lock_queue );
|
||||
blocking_lock_record *prev = NULL;
|
||||
|
||||
if(blr == NULL)
|
||||
return;
|
||||
if(blr == NULL)
|
||||
return;
|
||||
|
||||
/*
|
||||
* Go through the queue and see if we can get any of the locks.
|
||||
*/
|
||||
/*
|
||||
* Go through the queue and see if we can get any of the locks.
|
||||
*/
|
||||
|
||||
while(blr != NULL) {
|
||||
connection_struct *conn = NULL;
|
||||
uint16 vuid;
|
||||
files_struct *fsp = NULL;
|
||||
while(blr != NULL) {
|
||||
connection_struct *conn = NULL;
|
||||
uint16 vuid;
|
||||
files_struct *fsp = NULL;
|
||||
|
||||
/*
|
||||
* Ensure we don't have any old chain_fsp values
|
||||
* sitting around....
|
||||
*/
|
||||
chain_size = 0;
|
||||
file_chain_reset();
|
||||
fsp = blr->fsp;
|
||||
/*
|
||||
* Ensure we don't have any old chain_fsp values
|
||||
* sitting around....
|
||||
*/
|
||||
chain_size = 0;
|
||||
file_chain_reset();
|
||||
fsp = blr->fsp;
|
||||
|
||||
conn = conn_find(SVAL(blr->inbuf,smb_tid));
|
||||
vuid = (lp_security() == SEC_SHARE) ? UID_FIELD_INVALID :
|
||||
SVAL(blr->inbuf,smb_uid);
|
||||
conn = conn_find(SVAL(blr->inbuf,smb_tid));
|
||||
vuid = (lp_security() == SEC_SHARE) ? UID_FIELD_INVALID :
|
||||
SVAL(blr->inbuf,smb_uid);
|
||||
|
||||
DEBUG(5,("process_blocking_lock_queue: examining pending lock fnum = %d for file %s\n",
|
||||
fsp->fnum, fsp->fsp_name ));
|
||||
DEBUG(5,("process_blocking_lock_queue: examining pending lock fnum = %d for file %s\n",
|
||||
fsp->fnum, fsp->fsp_name ));
|
||||
|
||||
if((blr->expire_time != -1) && (blr->expire_time <= t)) {
|
||||
/*
|
||||
* Lock expired - throw away all previously
|
||||
* obtained locks and return lock error.
|
||||
*/
|
||||
DEBUG(5,("process_blocking_lock_queue: pending lock fnum = %d for file %s timed out.\n",
|
||||
fsp->fnum, fsp->fsp_name ));
|
||||
if((blr->expire_time != -1) && (blr->expire_time <= t)) {
|
||||
/*
|
||||
* Lock expired - throw away all previously
|
||||
* obtained locks and return lock error.
|
||||
*/
|
||||
DEBUG(5,("process_blocking_lock_queue: pending lock fnum = %d for file %s timed out.\n",
|
||||
fsp->fnum, fsp->fsp_name ));
|
||||
|
||||
brl_unlock(fsp->dev, fsp->inode, fsp->fnum,
|
||||
blr->lock_pid, sys_getpid(), conn->cnum,
|
||||
blr->offset, blr->count, True, NULL, NULL);
|
||||
brl_unlock(fsp->dev, fsp->inode, fsp->fnum,
|
||||
blr->lock_pid, sys_getpid(), conn->cnum,
|
||||
blr->offset, blr->count, True, NULL, NULL);
|
||||
|
||||
blocking_lock_reply_error(blr,NT_STATUS_FILE_LOCK_CONFLICT);
|
||||
free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
|
||||
blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
|
||||
continue;
|
||||
}
|
||||
blocking_lock_reply_error(blr,NT_STATUS_FILE_LOCK_CONFLICT);
|
||||
free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
|
||||
blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
|
||||
continue;
|
||||
}
|
||||
|
||||
if(!change_to_user(conn,vuid)) {
|
||||
DEBUG(0,("process_blocking_lock_queue: Unable to become user vuid=%d.\n",
|
||||
vuid ));
|
||||
/*
|
||||
* Remove the entry and return an error to the client.
|
||||
*/
|
||||
blocking_lock_reply_error(blr,NT_STATUS_ACCESS_DENIED);
|
||||
if(!change_to_user(conn,vuid)) {
|
||||
DEBUG(0,("process_blocking_lock_queue: Unable to become user vuid=%d.\n",
|
||||
vuid ));
|
||||
/*
|
||||
* Remove the entry and return an error to the client.
|
||||
*/
|
||||
blocking_lock_reply_error(blr,NT_STATUS_ACCESS_DENIED);
|
||||
|
||||
brl_unlock(fsp->dev, fsp->inode, fsp->fnum,
|
||||
blr->lock_pid, sys_getpid(), conn->cnum,
|
||||
blr->offset, blr->count, True, NULL, NULL);
|
||||
brl_unlock(fsp->dev, fsp->inode, fsp->fnum,
|
||||
blr->lock_pid, sys_getpid(), conn->cnum,
|
||||
blr->offset, blr->count, True, NULL, NULL);
|
||||
|
||||
free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
|
||||
blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
|
||||
continue;
|
||||
}
|
||||
free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
|
||||
blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
|
||||
continue;
|
||||
}
|
||||
|
||||
if(!set_current_service(conn,True)) {
|
||||
DEBUG(0,("process_blocking_lock_queue: Unable to become service Error was %s.\n", strerror(errno) ));
|
||||
/*
|
||||
* Remove the entry and return an error to the client.
|
||||
*/
|
||||
blocking_lock_reply_error(blr,NT_STATUS_ACCESS_DENIED);
|
||||
if(!set_current_service(conn,True)) {
|
||||
DEBUG(0,("process_blocking_lock_queue: Unable to become service Error was %s.\n", strerror(errno) ));
|
||||
/*
|
||||
* Remove the entry and return an error to the client.
|
||||
*/
|
||||
blocking_lock_reply_error(blr,NT_STATUS_ACCESS_DENIED);
|
||||
|
||||
brl_unlock(fsp->dev, fsp->inode, fsp->fnum,
|
||||
blr->lock_pid, sys_getpid(), conn->cnum,
|
||||
blr->offset, blr->count, True, NULL, NULL);
|
||||
brl_unlock(fsp->dev, fsp->inode, fsp->fnum,
|
||||
blr->lock_pid, sys_getpid(), conn->cnum,
|
||||
blr->offset, blr->count, True, NULL, NULL);
|
||||
|
||||
free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
|
||||
blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
|
||||
change_to_root_user();
|
||||
continue;
|
||||
}
|
||||
free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
|
||||
blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
|
||||
change_to_root_user();
|
||||
continue;
|
||||
}
|
||||
|
||||
/*
|
||||
* Go through the remaining locks and try and obtain them.
|
||||
* The call returns True if all locks were obtained successfully
|
||||
* and False if we still need to wait.
|
||||
*/
|
||||
/*
|
||||
* Go through the remaining locks and try and obtain them.
|
||||
* The call returns True if all locks were obtained successfully
|
||||
* and False if we still need to wait.
|
||||
*/
|
||||
|
||||
if(blocking_lock_record_process(blr)) {
|
||||
if(blocking_lock_record_process(blr)) {
|
||||
|
||||
brl_unlock(fsp->dev, fsp->inode, fsp->fnum,
|
||||
blr->lock_pid, sys_getpid(), conn->cnum,
|
||||
blr->offset, blr->count, True, NULL, NULL);
|
||||
brl_unlock(fsp->dev, fsp->inode, fsp->fnum,
|
||||
blr->lock_pid, sys_getpid(), conn->cnum,
|
||||
blr->offset, blr->count, True, NULL, NULL);
|
||||
|
||||
free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
|
||||
blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
|
||||
change_to_root_user();
|
||||
continue;
|
||||
}
|
||||
free_blocking_lock_record((blocking_lock_record *)ubi_slRemNext( &blocking_lock_queue, prev));
|
||||
blr = (blocking_lock_record *)(prev ? ubi_slNext(prev) : ubi_slFirst(&blocking_lock_queue));
|
||||
change_to_root_user();
|
||||
continue;
|
||||
}
|
||||
|
||||
change_to_root_user();
|
||||
change_to_root_user();
|
||||
|
||||
/*
|
||||
* Move to the next in the list.
|
||||
*/
|
||||
prev = blr;
|
||||
blr = (blocking_lock_record *)ubi_slNext(blr);
|
||||
}
|
||||
/*
|
||||
* Move to the next in the list.
|
||||
*/
|
||||
prev = blr;
|
||||
blr = (blocking_lock_record *)ubi_slNext(blr);
|
||||
}
|
||||
}
|
||||
|
||||
@ -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