Changeset 740 for vendor/current/source4/libcli/smb2

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

Location:

vendor/current/source4/libcli/smb2

Files:

• cancel.c (modified) (1 diff)
• config.mk (deleted)
• create.c (modified) (1 diff)
• find.c (modified) (3 diffs)
• lock.c (modified) (1 diff)
• negprot.c (modified) (4 diffs)
• request.c (modified) (1 diff)
• session.c (modified) (2 diffs)
• smb2.h (modified) (5 diffs)
• transport.c (modified) (1 diff)
• util.c (modified) (3 diffs)
• wscript_build (added)

vendor/current/source4/libcli/smb2/cancel.c

@@ -54 +54 @@
         SIVAL(c->out.hdr, SMB2_HDR_FLAGS,       0x00000002);
         SSVAL(c->out.hdr, SMB2_HDR_CREDIT,      0x0030);
-        SIVAL(c->out.hdr, SMB2_HDR_PID,         r->cancel.pending_id);
+        SBVAL(c->out.hdr, SMB2_HDR_ASYNC_ID,    r->cancel.async_id);
         SBVAL(c->out.hdr, SMB2_HDR_MESSAGE_ID,  c->seqnum);
         if (r->session) {

vendor/current/source4/libcli/smb2/create.c

@@ -132 +132 @@
                 enum ndr_err_code ndr_err;
                 DATA_BLOB sd_blob;
-                ndr_err = ndr_push_struct_blob(&sd_blob, req, NULL,
-                                               io->in.sec_desc,
+                ndr_err = ndr_push_struct_blob(&sd_blob, req, io->in.sec_desc,
                                                (ndr_push_flags_fn_t)ndr_push_security_descriptor);
                 if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {

vendor/current/source4/libcli/smb2/find.c

@@ -96 +96 @@
 */
 NTSTATUS smb2_find_level_recv(struct smb2_request *req, TALLOC_CTX *mem_ctx,
-                              uint8_t level, uint_t *count,
+                              uint8_t level, unsigned int *count,
                               union smb_search_data **io)
 {
@@ -103 +103 @@
         DATA_BLOB b;
         enum smb_search_data_level smb_level;
-        uint_t next_ofs=0;
+        unsigned int next_ofs=0;
 
         switch (level) {
@@ -172 +172 @@
 NTSTATUS smb2_find_level(struct smb2_tree *tree, TALLOC_CTX *mem_ctx,
                          struct smb2_find *f, 
-                         uint_t *count, union smb_search_data **io)
+                         unsigned int *count, union smb_search_data **io)
 {
         struct smb2_request *req;

vendor/current/source4/libcli/smb2/lock.c

@@ -40 +40 @@
 
         SSVAL(req->out.body, 0x02, io->in.lock_count);
-        SIVAL(req->out.body, 0x04, io->in.reserved);
+        SIVAL(req->out.body, 0x04, io->in.lock_sequence);
         smb2_push_handle(req->out.body+0x08, &io->in.file.handle);
 

vendor/current/source4/libcli/smb2/negprot.c

@@ -35 +35 @@
         struct smb2_request *req;
         uint16_t size = 0x24 + io->in.dialect_count*2;
-        enum ndr_err_code ndr_err;
         int i;
+        NTSTATUS status;
 
         req = smb2_request_init(transport, SMB2_OP_NEGPROT, size, false, 0);
@@ -47 +47 @@
         SSVAL(req->out.body, 0x06, io->in.reserved);
         SIVAL(req->out.body, 0x08, io->in.capabilities);
-        ndr_err = smbcli_push_guid(req->out.body, 0x0C, &io->in.client_guid);
-        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+        status = smbcli_push_guid(req->out.body, 0x0C, &io->in.client_guid);
+        if (!NT_STATUS_IS_OK(status)) {
                 talloc_free(req);
                 return NULL;
@@ -69 +69 @@
 {
         NTSTATUS status;
-        enum ndr_err_code ndr_err;
 
         if (!smb2_request_receive(req) ||
@@ -81 +80 @@
         io->out.dialect_revision   = SVAL(req->in.body, 0x04);
         io->out.reserved           = SVAL(req->in.body, 0x06);
-        ndr_err = smbcli_pull_guid(req->in.body, 0x08, &io->in.client_guid);
-        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+        status = smbcli_pull_guid(req->in.body, 0x08, &io->in.client_guid);
+        if (!NT_STATUS_IS_OK(status)) {
                 smb2_request_destroy(req);
-                return NT_STATUS_INTERNAL_ERROR;
+                return status;
         }
         io->out.capabilities       = IVAL(req->in.body, 0x18);

vendor/current/source4/libcli/smb2/request.c

@@ -176 +176 @@
 
         SBVAL(req->out.hdr,  SMB2_HDR_SESSION_ID, tree->session->uid);
+        SIVAL(req->out.hdr,  SMB2_HDR_PID, tree->session->pid);
         SIVAL(req->out.hdr,  SMB2_HDR_TID, tree->tid);
         req->session = tree->session;

vendor/current/source4/libcli/smb2/session.c

@@ -27 +27 @@
 #include "auth/gensec/gensec.h"
 
+#include <unistd.h>
+
 /**
   initialise a smb2_session structure
@@ -46 +48 @@
                 session->transport = talloc_reference(session, transport);
         }
+
+        session->pid = getpid();
 
         /* prepare a gensec context for later use */

vendor/current/source4/libcli/smb2/smb2.h

@@ -104 +104 @@
                 void (*func)(struct smb2_transport *, void *);
                 void *private_data;
-                uint_t period;
+                unsigned int period;
         } idle;
 
@@ -146 +146 @@
         struct gensec_security *gensec;
         uint64_t uid;
+        uint32_t pid;
         DATA_BLOB session_key;
         bool signing_active;
@@ -167 +168 @@
         /* each request is in one of 3 possible states */
         enum smb2_request_state state;
-        
+
         struct smb2_transport *transport;
         struct smb2_session   *session;
@@ -177 +178 @@
                 bool do_cancel;
                 bool can_cancel;
-                uint32_t pending_id;
+                uint64_t async_id;
         } cancel;
 
@@ -183 +184 @@
            or code detecting error. */
         NTSTATUS status;
-        
+
         struct smb2_request_buffer in;
         struct smb2_request_buffer out;

vendor/current/source4/libcli/smb2/transport.c

@@ -303 +303 @@
             NT_STATUS_EQUAL(req->status, STATUS_PENDING)) {
                 req->cancel.can_cancel = true;
-                req->cancel.pending_id = IVAL(hdr, SMB2_HDR_PID);
+                req->cancel.async_id = BVAL(hdr, SMB2_HDR_ASYNC_ID);
                 for (i=0; i< req->cancel.do_cancel; i++) {
                         smb2_cancel(req);

vendor/current/source4/libcli/smb2/util.c

@@ -26 +26 @@
 #include "libcli/smb2/smb2_calls.h"
 #include "libcli/smb_composite/smb_composite.h"
+#include "librpc/gen_ndr/ndr_security.h"
 
 /*
@@ -109 +110 @@
         NTSTATUS status;
         uint32_t total_deleted = 0;
-        uint_t count, i;
+        unsigned int count, i;
         union smb_search_data *list;
         TALLOC_CTX *tmp_ctx = talloc_new(tree);
@@ -221 +222 @@
         return total_deleted;
 }
+
+/*
+  check if two SMB2 file handles are the same
+*/
+bool smb2_util_handle_equal(const struct smb2_handle h1,
+                            const struct smb2_handle h2)
+{
+        return (h1.data[0] == h2.data[0]) && (h1.data[1] == h2.data[1]);
+}