Changeset 740 for vendor/current/source3/smbd/pipes.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/pipes.c (modified) (4 diffs)

vendor/current/source3/smbd/pipes.c

@@ -27 +27 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
+#include "smbd/globals.h"
+#include "libcli/security/security.h"
+#include "rpc_server/srv_pipe_hnd.h"
 
 #define PIPE            "\\PIPE\\"
@@ -66 +70 @@
         }
 
-        status = np_open(NULL, name, conn->client_address,
-                         conn->server_info, &fsp->fake_file_handle);
+        status = np_open(fsp, name,
+                         conn->sconn->local_address,
+                         conn->sconn->remote_address,
+                         &conn->sconn->client_id,
+                         conn->session_info,
+                         conn->sconn->msg_ctx,
+                         &fsp->fake_file_handle);
         if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(10, ("np_open(%s) returned %s\n", name,
@@ -235 +244 @@
 
  send:
-        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,
@@ -450 +459 @@
 
         srv_set_message((char *)req->outbuf, 12, nread, False);
-  
+
+#if 0
+        /*
+         * we should return STATUS_BUFFER_OVERFLOW if there's
+         * out standing data.
+         *
+         * But we can't enable it yet, as it has bad interactions
+         * with fixup_chain_error_packet() in chain_reply().
+         */
+        if (is_data_outstanding) {
+                error_packet_set((char *)req->outbuf, ERRDOS, ERRmoredata,
+                                 STATUS_BUFFER_OVERFLOW, __LINE__, __FILE__);
+        }
+#endif
+
         SSVAL(req->outbuf,smb_vwv5,nread);
         SSVAL(req->outbuf,smb_vwv6,