Changeset 745 for trunk/server/source4/smb_server/smb2

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)
• source4/smb_server/smb2/config.mk (deleted)
• source4/smb_server/smb2/fileinfo.c (modified) (2 diffs)
• source4/smb_server/smb2/fileio.c (modified) (2 diffs)
• source4/smb_server/smb2/find.c (modified) (1 diff)
• source4/smb_server/smb2/negprot.c (modified) (6 diffs)
• source4/smb_server/smb2/receive.c (modified) (2 diffs)
• source4/smb_server/smb2/sesssetup.c (modified) (9 diffs)
• source4/smb_server/smb2/tcon.c (modified) (4 diffs)
• source4/smb_server/smb2/wscript_build (copied) (copied from vendor/current/source4/smb_server/smb2/wscript_build )

trunk/server/source4/smb_server/smb2/fileinfo.c

@@ -151 +151 @@
         enum ndr_err_code ndr_err;
 
-        ndr_err = ndr_push_struct_blob(&op->info->out.blob, op->req, NULL,
+        ndr_err = ndr_push_struct_blob(&op->info->out.blob, op->req, 
                                        io->query_secdesc.out.sd,
                                        (ndr_push_flags_fn_t)ndr_push_security_descriptor);
@@ -317 +317 @@
                 NT_STATUS_HAVE_NO_MEMORY(io->set_secdesc.in.sd);
 
-                ndr_err = ndr_pull_struct_blob(&op->info->in.blob, io, NULL,
+                ndr_err = ndr_pull_struct_blob(&op->info->in.blob, io, 
                                                io->set_secdesc.in.sd,
                                                (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);

trunk/server/source4/smb_server/smb2/fileio.c

@@ -110 +110 @@
                                 return;
                         }
-                        ndr_err = ndr_pull_struct_blob(&io->smb2.in.blobs.blobs[i].data, io, NULL,
+                        ndr_err = ndr_pull_struct_blob(&io->smb2.in.blobs.blobs[i].data, io, 
                                                        io->smb2.in.sec_desc,
                                                        (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
@@ -346 +346 @@
         io->smb2.level                  = RAW_LOCK_SMB2;
         io->smb2.in.lock_count          = SVAL(req->in.body, 0x02);
-        io->smb2.in.reserved            = IVAL(req->in.body, 0x04);
+        io->smb2.in.lock_sequence       = IVAL(req->in.body, 0x04);
         io->smb2.in.file.ntvfs          = smb2srv_pull_handle(req, req->in.body, 0x08);
         if (req->in.body_size < 24 + 24*(uint64_t)io->smb2.in.lock_count) {

trunk/server/source4/smb_server/smb2/find.c

@@ -131 +131 @@
                 return ntvfs_search_next(state->req->ntvfs, state->fn, state, smb2srv_find_callback);
         }
-
-        /* should not be reached */
-        return NT_STATUS_INTERNAL_ERROR;
 }
 

trunk/server/source4/smb_server/smb2/negprot.c

@@ -120 +120 @@
 
         ZERO_STRUCT(io->out);
-        switch (lp_server_signing(req->smb_conn->lp_ctx)) {
+        switch (lpcfg_server_signing(req->smb_conn->lp_ctx)) {
         case SMB_SIGNING_OFF:
                 io->out.security_mode = 0;
@@ -136 +136 @@
         io->out.dialect_revision   = dialect;
         io->out.capabilities       = 0;
-        io->out.max_transact_size  = lp_parm_ulong(req->smb_conn->lp_ctx, NULL, 
+        io->out.max_transact_size  = lpcfg_parm_ulong(req->smb_conn->lp_ctx, NULL,
                                                    "smb2", "max transaction size", 0x10000);
-        io->out.max_read_size      = lp_parm_ulong(req->smb_conn->lp_ctx, NULL, 
+        io->out.max_read_size      = lpcfg_parm_ulong(req->smb_conn->lp_ctx, NULL,
                                                    "smb2", "max read size", 0x10000);
-        io->out.max_write_size     = lp_parm_ulong(req->smb_conn->lp_ctx, NULL, 
+        io->out.max_write_size     = lpcfg_parm_ulong(req->smb_conn->lp_ctx, NULL,
                                                    "smb2", "max write size", 0x10000);
         io->out.system_time        = timeval_to_nttime(&current_time);
@@ -154 +154 @@
 {
         NTSTATUS status;
-        enum ndr_err_code ndr_err;
 
         if (NT_STATUS_IS_ERR(req->status)) {
@@ -171 +170 @@
         SIVAL(req->out.body, 0x04, io->out.dialect_revision);
         SIVAL(req->out.body, 0x06, io->out.reserved);
-        ndr_err = smbcli_push_guid(req->out.body, 0x08, &io->out.server_guid);
-        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+        status = smbcli_push_guid(req->out.body, 0x08, &io->out.server_guid);
+        if (!NT_STATUS_IS_OK(status)) {
                 smbsrv_terminate_connection(req->smb_conn, nt_errstr(status));
                 talloc_free(req);
@@ -198 +197 @@
         struct smb2_negprot *io;
         int i;
-        enum ndr_err_code ndr_err;
 
         if (req->in.body_size < 0x26) {
@@ -216 +214 @@
         io->in.reserved      = SVAL(req->in.body, 0x06);
         io->in.capabilities  = IVAL(req->in.body, 0x08);
-        ndr_err = smbcli_pull_guid(req->in.body, 0xC, &io->in.client_guid);
-        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+        req->status = smbcli_pull_guid(req->in.body, 0xC, &io->in.client_guid);
+        if (!NT_STATUS_IS_OK(req->status)) {
                 smbsrv_terminate_connection(req->smb_conn, "Bad GUID in SMB2 negprot");
                 talloc_free(req);

trunk/server/source4/smb_server/smb2/receive.c

@@ -323 +323 @@
         flags                   = IVAL(req->in.hdr, SMB2_HDR_FLAGS);
 
-        if (req->smb_conn->highest_smb2_seqnum != 0 &&
+        if (opcode != SMB2_OP_CANCEL &&
+            req->smb_conn->highest_smb2_seqnum != 0 &&
             req->seqnum <= req->smb_conn->highest_smb2_seqnum) {
                 smbsrv_terminate_connection(req->smb_conn, "Invalid SMB2 sequence number");
                 return NT_STATUS_INVALID_PARAMETER;
         }
-        req->smb_conn->highest_smb2_seqnum = req->seqnum;
-        
+        if (opcode != SMB2_OP_CANCEL) {
+                req->smb_conn->highest_smb2_seqnum = req->seqnum;
+        }
+
         req->session    = smbsrv_session_find(req->smb_conn, uid, req->request_time);
         req->tcon       = smbsrv_smb2_tcon_find(req->session, tid, req->request_time);
@@ -657 +660 @@
         /* this is the size that w2k uses, and it appears to be important for
            good performance */
-        smb_conn->negotiate.max_recv = lp_max_xmit(smb_conn->lp_ctx);
+        smb_conn->negotiate.max_recv = lpcfg_max_xmit(smb_conn->lp_ctx);
 
         smb_conn->negotiate.zone_offset = get_time_zone(time(NULL));

trunk/server/source4/smb_server/smb2/sesssetup.c

@@ -20 +20 @@
 
 #include "includes.h"
+#include <tevent.h>
 #include "auth/gensec/gensec.h"
 #include "auth/auth.h"
@@ -27 +28 @@
 #include "smb_server/smb2/smb2_server.h"
 #include "smbd/service_stream.h"
+#include "lib/stream/packet.h"
 
 static void smb2srv_sesssetup_send(struct smb2srv_request *req, union smb_sesssetup *io)
@@ -58 +60 @@
 };
 
-static void smb2srv_sesssetup_callback(struct gensec_update_request *greq, void *private_data)
-{
-        struct smb2srv_sesssetup_callback_ctx *ctx = talloc_get_type(private_data,
+static void smb2srv_sesssetup_callback(struct tevent_req *subreq)
+{
+        struct smb2srv_sesssetup_callback_ctx *ctx = tevent_req_callback_data(subreq,
                                                      struct smb2srv_sesssetup_callback_ctx);
         struct smb2srv_request *req = ctx->req;
@@ -68 +70 @@
         NTSTATUS status;
 
-        status = gensec_update_recv(greq, req, &io->smb2.out.secblob);
+        packet_recv_enable(req->smb_conn->packet);
+
+        status = gensec_update_recv(subreq, req, &io->smb2.out.secblob);
+        TALLOC_FREE(subreq);
         if (NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
                 goto done;
@@ -95 +100 @@
         io->smb2.out.uid = smb_sess->vuid;
 failed:
-        req->status = auth_nt_status_squash(status);
+        req->status = nt_status_squash(status);
         smb2srv_sesssetup_send(req, io);
         if (!NT_STATUS_IS_OK(status) && !
@@ -109 +114 @@
         struct smbsrv_session *smb_sess = NULL;
         uint64_t vuid;
+        struct tevent_req *subreq;
 
         io->smb2.out.session_flags = 0;
@@ -175 +181 @@
         callback_ctx->smb_sess  = smb_sess;
 
-        gensec_update_send(smb_sess->gensec_ctx, io->smb2.in.secblob,
-                           smb2srv_sesssetup_callback, callback_ctx);
+        subreq = gensec_update_send(callback_ctx,
+                                    req->smb_conn->connection->event.ctx,
+                                    smb_sess->gensec_ctx,
+                                    io->smb2.in.secblob);
+        if (!subreq) goto nomem;
+        tevent_req_set_callback(subreq, smb2srv_sesssetup_callback, callback_ctx);
 
         /* note that we ignore SMB2_NEGOTIATE_SIGNING_ENABLED from the client.
@@ -193 +203 @@
         }
 
+        /* disable receipt of more packets on this socket until we've
+           finished with the session setup. This avoids a problem with
+           crashes if we get EOF on the socket while processing a session
+           setup */
+        packet_recv_disable(req->smb_conn->packet);
+
         return;
 nomem:
@@ -198 +214 @@
 failed:
         talloc_free(smb_sess);
-        req->status = auth_nt_status_squash(status);
+        req->status = nt_status_squash(status);
         smb2srv_sesssetup_send(req, io);
 }

trunk/server/source4/smb_server/smb2/tcon.c

@@ -85 +85 @@
 }
 
-struct ntvfs_handle *smb2srv_pull_handle(struct smb2srv_request *req, const uint8_t *base, uint_t offset)
+struct ntvfs_handle *smb2srv_pull_handle(struct smb2srv_request *req, const uint8_t *base, unsigned int offset)
 {
         struct smbsrv_tcon *tcon;
@@ -161 +161 @@
 }
 
-void smb2srv_push_handle(uint8_t *base, uint_t offset, struct ntvfs_handle *ntvfs)
+void smb2srv_push_handle(uint8_t *base, unsigned int offset, struct ntvfs_handle *ntvfs)
 {
         struct smbsrv_handle *handle = talloc_get_type(ntvfs->frontend_data.private_data,
@@ -305 +305 @@
         }
 
-        status = ntvfs_set_addr_callbacks(tcon->ntvfs, smbsrv_get_my_addr, smbsrv_get_peer_addr, req->smb_conn);
-        if (!NT_STATUS_IS_OK(status)) {
-                DEBUG(0,("smb2srv_tcon_backend: NTVFS failed to set the addr callbacks!\n"));
+        status = ntvfs_set_addresses(tcon->ntvfs,
+                                     req->smb_conn->connection->local_address,
+                                     req->smb_conn->connection->remote_address);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0,("smb2srv_tcon_backend: NTVFS failed to set the address!\n"));
                 goto failed;
         }
@@ -344 +346 @@
         status = ntvfs_connect(req->ntvfs, io);
         if (!NT_STATUS_IS_OK(status)) {
-                DEBUG(0,("smb2srv_tcon_backend: NTVFS ntvfs_connect() failed!\n"));
+                DEBUG(0,("smb2srv_tcon_backend: NTVFS ntvfs_connect() failed: %s!\n", nt_errstr(status)));
                 goto failed;
         }