Changeset 77 for trunk/samba/source/libsmb/cliconnect.c

Timestamp:

Sep 30, 2007, 3:42:50 AM (18 years ago)

Author:

Paul Smedley

Message:

Update trunk to 3.2.0pre1

File:

• trunk/samba/source/libsmb/cliconnect.c (modified) (13 diffs)

trunk/samba/source/libsmb/cliconnect.c

@@ -7 +7 @@
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
@@ -16 +16 @@
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
@@ -62 +61 @@
                                           const char *workgroup)
 {
-        DATA_BLOB session_key = data_blob(NULL, 0);
-        DATA_BLOB lm_response = data_blob(NULL, 0);
+        DATA_BLOB session_key = data_blob_null;
+        DATA_BLOB lm_response = data_blob_null;
         fstring pword;
         char *p;
@@ -300 +299 @@
 {
         uint32 capabilities = cli_session_setup_capabilities(cli);
-        DATA_BLOB lm_response = data_blob(NULL, 0);
-        DATA_BLOB nt_response = data_blob(NULL, 0);
-        DATA_BLOB session_key = data_blob(NULL, 0);
+        DATA_BLOB lm_response = data_blob_null;
+        DATA_BLOB nt_response = data_blob_null;
+        DATA_BLOB session_key = data_blob_null;
         NTSTATUS result;
         char *p;
@@ -335 +334 @@
 
 #ifdef LANMAN_ONLY
-                        nt_response = data_blob(NULL, 0);
+                        nt_response = data_blob_null;
 #else
                         nt_response = data_blob(NULL, 24);
@@ -486 +485 @@
 static DATA_BLOB cli_session_setup_blob_receive(struct cli_state *cli)
 {
-        DATA_BLOB blob2 = data_blob(NULL, 0);
+        DATA_BLOB blob2 = data_blob_null;
         char *p;
         size_t len;
@@ -535 +534 @@
         int32 remaining = blob.length;
         int32 cur = 0;
-        DATA_BLOB send_blob = data_blob(NULL, 0);
+        DATA_BLOB send_blob = data_blob_null;
         int32 max_blob_size = 0;
-        DATA_BLOB receive_blob = data_blob(NULL, 0);
+        DATA_BLOB receive_blob = data_blob_null;
 
         if (cli->max_xmit < BASE_SESSSETUP_BLOB_PACKET_SIZE + 1) {
@@ -555 +554 @@
                         remaining -= max_blob_size;
                 } else {
-                        DATA_BLOB null_blob = data_blob(NULL, 0);
+                        DATA_BLOB null_blob = data_blob_null;
 
                         send_blob.length = remaining; 
@@ -658 +657 @@
         int turn = 1;
         DATA_BLOB msg1;
-        DATA_BLOB blob = data_blob(NULL, 0);
-        DATA_BLOB blob_in = data_blob(NULL, 0);
-        DATA_BLOB blob_out = data_blob(NULL, 0);
+        DATA_BLOB blob = data_blob_null;
+        DATA_BLOB blob_in = data_blob_null;
+        DATA_BLOB blob_out = data_blob_null;
 
         cli_temp_set_signing(cli);
@@ -717 +716 @@
                 } else if ((turn == 1) && 
                            NT_STATUS_EQUAL(nt_status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
-                        DATA_BLOB tmp_blob = data_blob(NULL, 0);
+                        DATA_BLOB tmp_blob = data_blob_null;
                         /* the server might give us back two challenges */
                         if (!spnego_parse_challenge(blob, &blob_in, 
@@ -726 +725 @@
                         data_blob_free(&tmp_blob);
                 } else {
-                        if (!spnego_parse_auth_response(blob, nt_status, 
+                        if (!spnego_parse_auth_response(blob, nt_status, OID_NTLMSSP, 
                                                         &blob_in)) {
                                 DEBUG(3,("Failed to parse auth response\n"));
@@ -745 +744 @@
                 DATA_BLOB key = data_blob(ntlmssp_state->session_key.data,
                                           ntlmssp_state->session_key.length);
-                DATA_BLOB null_blob = data_blob(NULL, 0);
+                DATA_BLOB null_blob = data_blob_null;
                 BOOL res;
 
@@ -1850 +1849 @@
         /* Go looking for workgroups by broadcasting on the local network */ 
 
-        if (!name_resolve_bcast(MSBROWSE, 1, &ip_list, &count)) {
+        if (!NT_STATUS_IS_OK(name_resolve_bcast(MSBROWSE, 1, &ip_list,
+                                                &count))) {
                 DEBUG(99, ("No master browsers responded\n"));
                 return False;