Changeset 740 for vendor/current/source3/smbd/ipc.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/smbd/ipc.c (modified) (7 diffs)

vendor/current/source3/smbd/ipc.c

@@ -26 +26 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
+#include "smbprofile.h"
+#include "rpc_server/srv_pipe_hnd.h"
 
 #define NERR_notsupported 50
@@ -94 +97 @@
         int ldata  = rdata  ? rdata_len : 0;
         int lparam = rparam ? rparam_len : 0;
-        struct smbd_server_connection *sconn = smbd_server_conn;
+        struct smbd_server_connection *sconn = req->sconn;
         int max_send = sconn->smb1.sessions.max_send;
 
@@ -136 +139 @@
 
         show_msg((char *)req->outbuf);
-        if (!srv_send_smb(smbd_server_fd(), (char *)req->outbuf,
+        if (!srv_send_smb(sconn, (char *)req->outbuf,
                           true, req->seqnum+1,
                           IS_CONN_ENCRYPTED(conn), &req->pcd)) {
@@ -196 +199 @@
 
                 show_msg((char *)req->outbuf);
-                if (!srv_send_smb(smbd_server_fd(), (char *)req->outbuf,
+                if (!srv_send_smb(sconn, (char *)req->outbuf,
                                   true, req->seqnum+1,
                                   IS_CONN_ENCRYPTED(conn), &req->pcd))
@@ -228 +231 @@
         struct tevent_req *subreq;
         struct dcerpc_cmd_state *state;
+        bool busy;
 
         if (!fsp_is_np(fsp)) {
                 api_no_reply(conn, req);
+                return;
+        }
+
+        /*
+         * Trans requests are only allowed
+         * if no other Trans or Read is active
+         */
+        busy = np_read_in_progress(fsp->fake_file_handle);
+        if (busy) {
+                reply_nterror(req, NT_STATUS_PIPE_BUSY);
                 return;
         }
@@ -303 +317 @@
  send:
         if (!srv_send_smb(
-                    smbd_server_fd(), (char *)req->outbuf,
+                    req->sconn, (char *)req->outbuf,
                     true, req->seqnum+1,
                     IS_CONN_ENCRYPTED(req->conn) || req->encrypted,
                     &req->pcd)) {
-                exit_server_cleanly("construct_reply: srv_send_smb failed.");
+                exit_server_cleanly("api_dcerpc_cmd_write_done: "
+                                    "srv_send_smb failed.");
         }
         TALLOC_FREE(req);
@@ -330 +345 @@
                 reply_nterror(req, status);
 
-                if (!srv_send_smb(smbd_server_fd(), (char *)req->outbuf,
+                if (!srv_send_smb(req->sconn, (char *)req->outbuf,
                                   true, req->seqnum+1,
                                   IS_CONN_ENCRYPTED(req->conn)
                                   ||req->encrypted, &req->pcd)) {
-                        exit_server_cleanly("construct_reply: srv_send_smb "
-                                            "failed.");
+                        exit_server_cleanly("api_dcerpc_cmd_read_done: "
+                                            "srv_send_smb failed.");
                 }
                 TALLOC_FREE(req);