Changeset 745 for trunk/server/source3/smbd/smb2_negprot.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_negprot.c (modified) (6 diffs)

trunk/server/source3/smbd/smb2_negprot.c

@@ -20 +20 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
@@ -55 +56 @@
         req->outbuf = NULL;
 
-        smbd_smb2_first_negprot(smbd_server_conn, smb2_inbuf, len);
+        smbd_smb2_first_negprot(req->sconn, smb2_inbuf, len);
         return;
 }
@@ -78 +79 @@
         uint32_t capabilities;
 
-/* TODO: drop the connection with INVALI_PARAMETER */
+/* TODO: drop the connection with INVALID_PARAMETER */
 
         if (req->in.vector[i+1].iov_len != (expected_body_size & 0xFFFFFFFE)) {
@@ -120 +121 @@
 
         /* negprot_spnego() returns a the server guid in the first 16 bytes */
-        negprot_spnego_blob = negprot_spnego();
+        negprot_spnego_blob = negprot_spnego(req, req->sconn);
         if (negprot_spnego_blob.data == NULL) {
                 return smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY);
         }
-        talloc_steal(req, negprot_spnego_blob.data);
 
         if (negprot_spnego_blob.length < 16) {
@@ -165 +165 @@
         SIVAL(outbody.data, 0x18,
               capabilities);                    /* capabilities */
-        SIVAL(outbody.data, 0x1C, 0x00010000);  /* max transact size */
-        SIVAL(outbody.data, 0x20, 0x00010000);  /* max read size */
-        SIVAL(outbody.data, 0x24, 0x00010000);  /* max write size */
+        SIVAL(outbody.data, 0x1C, lp_smb2_max_trans()); /* max transact size */
+        SIVAL(outbody.data, 0x20, lp_smb2_max_read());  /* max read size */
+        SIVAL(outbody.data, 0x24, lp_smb2_max_write()); /* max write size */
         SBVAL(outbody.data, 0x28, 0);           /* system time */
         SBVAL(outbody.data, 0x30, 0);           /* server start time */
@@ -178 +178 @@
         outdyn = security_buffer;
 
+        req->sconn->using_smb2 = true;
+
         return smbd_smb2_request_done(req, outbody, &outdyn);
 }