Changeset 336 for branches/samba-3.0/source/smbd/process.c

Timestamp:

Oct 8, 2009, 7:51:22 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.0 to 3.0.37 (unsupported security update)

File:

• branches/samba-3.0/source/smbd/process.c (modified) (7 diffs)

branches/samba-3.0/source/smbd/process.c

@@ -94 +94 @@
         msg->request_time = request_time;
         msg->end_time = end_time;
+        msg->processed = false;
 
         if (private_data) {
@@ -163 +164 @@
 
 /****************************************************************************
- Return true if this mid is on the deferred queue.
+ Return true if this mid is on the deferred queue and was not yet processed.
 ****************************************************************************/
 
@@ -171 +172 @@
 
         for (pml = deferred_open_queue; pml; pml = pml->next) {
-                if (SVAL(pml->buf.data,smb_mid) == mid) {
+                if (SVAL(pml->buf.data,smb_mid) == mid && !pml->processed) {
                         return True;
                 }
@@ -410 +411 @@
                            know this is a retry. */
                         DEBUG(5,("receive_message_or_smb: returning deferred open smb message.\n"));
+
+                        /* Mark the message as processed so this is not
+                         * re-processed in error. */
+                        msg->processed = true;
                         return True;
                 }
@@ -968 +973 @@
 
                         if (!change_to_user(conn,session_tag)) {
-                                remove_deferred_open_smb_message(
-                                        SVAL(inbuf, smb_mid));
                                 return(ERROR_NT(NT_STATUS_DOS(ERRSRV,ERRbaduid)));
                         }
@@ -1018 +1021 @@
 static int construct_reply(char *inbuf,char *outbuf,int size,int bufsize)
 {
+        struct pending_message_list *pml = NULL;
         int type = CVAL(inbuf,smb_com);
         int outsize = 0;
         int msg_type = CVAL(inbuf,0);
+        uint16_t mid = SVAL(inbuf, smb_mid);
 
         chain_size = 0;
@@ -1032 +1037 @@
 
         outsize = switch_message(type,inbuf,outbuf,size,bufsize);
+
+        /* If this was a deferred message and it's still there and
+         * was processed, remove it. */
+        pml = get_open_deferred_message(mid);
+        if (pml && pml->processed) {
+                remove_deferred_open_smb_message(mid);
+        }
 
         outsize += chain_size;