Changeset 740 for vendor/current/source4/libcli/smb2/negprot.c

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source4/libcli/smb2/negprot.c (modified) (4 diffs)

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);