Changeset 732 for branches/samba-3.5.x/source3/libsmb/cliconnect.c

Timestamp:

Nov 12, 2012, 4:35:55 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.12

File:

• branches/samba-3.5.x/source3/libsmb/cliconnect.c (modified) (4 diffs)

branches/samba-3.5.x/source3/libsmb/cliconnect.c

@@ -1075 +1075 @@
                         if (dest_realm) {
                                 realm = SMB_STRDUP(dest_realm);
+                                if (!realm) {
+                                        return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
+                                }
                                 strupper_m(realm);
                         } else {
@@ -1086 +1089 @@
                         }
 
-                        if (realm && *realm) {
-                                principal = talloc_asprintf(talloc_tos(),
-                                                            "cifs/%s@%s",
-                                                            cli->desthost,
-                                                            realm);
-                                if (!principal) {
-                                        SAFE_FREE(realm);
+                        if (realm == NULL || *realm == '\0') {
+                                realm = SMB_STRDUP(lp_realm());
+                                if (!realm) {
                                         return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
                                 }
-                                DEBUG(3,("cli_session_setup_spnego: guessed "
-                                        "server principal=%s\n",
-                                        principal ? principal : "<null>"));
+                                strupper_m(realm);
+                                DEBUG(3,("cli_session_setup_spnego: cannot "
+                                        "get realm from dest_realm %s, "
+                                        "desthost %s. Using default "
+                                        "smb.conf realm %s\n",
+                                        dest_realm ? dest_realm : "<null>",
+                                        cli->desthost,
+                                        realm));
                         }
+
+                        principal = talloc_asprintf(talloc_tos(),
+                                                    "cifs/%s@%s",
+                                                    cli->desthost,
+                                                    realm);
+                        if (!principal) {
+                                SAFE_FREE(realm);
+                                return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
+                        }
+                        DEBUG(3,("cli_session_setup_spnego: guessed "
+                                "server principal=%s\n",
+                                principal ? principal : "<null>"));
+
                         SAFE_FREE(realm);
                 }
@@ -1700 +1717 @@
                 struct timespec ts;
                 bool negotiated_smb_signing = false;
+
+                if (wct != 0x11) {
+                        tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                        return;
+                }
 
                 /* NT protocol */
@@ -1766 +1788 @@
 
         } 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);