Changeset 745 for trunk/server/source3/smbd/smb2_glue.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/smb2_glue.c (modified) (3 diffs)

trunk/server/source3/smbd/smb2_glue.c

@@ -20 +20 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
@@ -39 +40 @@
         smbreq->tid = req->tcon->compat_conn->cnum;
         smbreq->conn = req->tcon->compat_conn;
+        smbreq->sconn = req->sconn;
         smbreq->smbpid = (uint16_t)IVAL(inhdr, SMB2_HDR_PID);
         smbreq->flags2 = FLAGS2_UNICODE_STRINGS |
@@ -47 +49 @@
                 smbreq->flags2 |= FLAGS2_DFS_PATHNAMES;
         }
+        smbreq->mid = BVAL(inhdr, SMB2_HDR_MESSAGE_ID);
         smbreq->chain_fsp = req->compat_chain_fsp;
+        smbreq->smb2req = req;
+        req->smb1req = smbreq;
 
         return smbreq;
 }
+
+/*********************************************************
+ Called from file_free() to remove any chained fsp pointers.
+*********************************************************/
+
+void remove_smb2_chained_fsp(files_struct *fsp)
+{
+        struct smbd_server_connection *sconn = fsp->conn->sconn;
+        struct smbd_smb2_request *smb2req;
+
+        for (smb2req = sconn->smb2.requests; smb2req; smb2req = smb2req->next) {
+                if (smb2req->compat_chain_fsp == fsp) {
+                        smb2req->compat_chain_fsp = NULL;
+                }
+                if (smb2req->smb1req && smb2req->smb1req->chain_fsp == fsp) {
+                        smb2req->smb1req->chain_fsp = NULL;
+                }
+        }
+}