Changeset 746 for vendor/current/source3/libsmb/cliconnect.c

Timestamp:

Nov 27, 2012, 4:56:06 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated vendor to 3.6.9

File:

• vendor/current/source3/libsmb/cliconnect.c (modified) (13 diffs)

vendor/current/source3/libsmb/cliconnect.c

@@ -362 +362 @@
  fail:
         TALLOC_FREE(frame);
-        if (!NT_STATUS_IS_OK(status)) {
-                cli_set_error(cli, status);
-        }
         return status;
 }
@@ -599 +596 @@
  fail:
         TALLOC_FREE(frame);
-        if (!NT_STATUS_IS_OK(status)) {
-                cli_set_error(cli, status);
-        }
         return status;
 }
@@ -803 +797 @@
  fail:
         TALLOC_FREE(frame);
-        if (!NT_STATUS_IS_OK(status)) {
-                cli_set_error(cli, status);
-        }
         return status;
 }
@@ -1171 +1162 @@
  fail:
         TALLOC_FREE(frame);
-        if (!NT_STATUS_IS_OK(status)) {
-                cli_set_error(cli, status);
-        }
         return status;
 }
@@ -1789 +1777 @@
 fail:
         TALLOC_FREE(ev);
-        if (!NT_STATUS_IS_OK(status)) {
-                cli_set_error(cli, status);
-        }
         return status;
 }
@@ -2013 +1998 @@
 
         if (cli->protocol < PROTOCOL_LANMAN1) {
+                /*
+                 * Ensure cli->server_domain,
+                 * cli->server_os and cli->server_type
+                 * are valid pointers.
+                 */
+                cli->server_domain = talloc_strdup(cli, "");
+                cli->server_os = talloc_strdup(cli, "");
+                cli->server_type = talloc_strdup(cli, "");
+                if (cli->server_domain == NULL ||
+                                cli->server_os == NULL ||
+                                cli->server_type == NULL) {
+                        return NT_STATUS_NO_MEMORY;
+                }
                 return NT_STATUS_OK;
         }
@@ -2176 +2174 @@
 fail:
         TALLOC_FREE(ev);
-        if (!NT_STATUS_IS_OK(status)) {
-                cli_set_error(cli, status);
-        }
         return status;
 }
@@ -2472 +2467 @@
  fail:
         TALLOC_FREE(frame);
-        if (!NT_STATUS_IS_OK(status)) {
-                cli_set_error(cli, status);
-        }
         return status;
 }
@@ -2555 +2547 @@
 fail:
         TALLOC_FREE(ev);
-        if (!NT_STATUS_IS_OK(status)) {
-                cli_set_error(cli, status);
-        }
         return status;
 }
@@ -2667 +2656 @@
                 struct timespec ts;
                 bool negotiated_smb_signing = false;
+                DATA_BLOB blob = data_blob_null;
+
+                if (wct != 0x11) {
+                        tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                        return;
+                }
 
                 /* NT protocol */
@@ -2687 +2682 @@
                 if (!(cli->capabilities & CAP_EXTENDED_SECURITY) &&
                     smb_buflen(inbuf) > 8) {
+                        blob = data_blob_const(bytes + 8, num_bytes - 8);
+                }
+
+                if (blob.length > 0) {
                         ssize_t ret;
-                        status = smb_bytes_talloc_string(
-                                cli, (char *)inbuf, &cli->server_domain,
-                                bytes + 8, num_bytes - 8, &ret);
-                        if (tevent_req_nterror(req, status)) {
+                        char *server_domain = NULL;
+
+                        ret = clistr_pull_talloc(cli,
+                                                 (const char *)inbuf,
+                                                 SVAL(inbuf, smb_flg2),
+                                                 &server_domain,
+                                                 (char *)blob.data,
+                                                 blob.length,
+                                                 STR_TERMINATE|
+                                                 STR_UNICODE|
+                                                 STR_NOALIGN);
+                        if (ret == -1) {
+                                tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
                                 return;
+                        }
+                        if (server_domain) {
+                                cli->server_domain = server_domain;
                         }
                 }
@@ -2741 +2752 @@
 
         } else if (cli->protocol >= PROTOCOL_LANMAN1) {
+                if (wct != 0x0D) {
+                        tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                        return;
+                }
+
                 cli->use_spnego = False;
                 cli->sec_mode = SVAL(vwv + 1, 0);
@@ -2810 +2826 @@
  fail:
         TALLOC_FREE(frame);
-        if (!NT_STATUS_IS_OK(status)) {
-                cli_set_error(cli, status);
-        }
         return status;
 }