Changeset 599 for trunk/server/source3/libsmb/cliconnect.c

Timestamp:

Jul 6, 2011, 8:21:13 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.9

File:

• trunk/server/source3/libsmb/cliconnect.c (modified) (4 diffs)

trunk/server/source3/libsmb/cliconnect.c

@@ -1057 +1057 @@
                 }
 
-                /* If we get a bad principal, try to guess it if
-                   we have a valid host NetBIOS name.
+                /* We may not be allowed to use the server-supplied SPNEGO principal, or it may not have been supplied to us
                  */
-                if (strequal(principal, ADS_IGNORE_PRINCIPAL)) {
+                if (!lp_client_use_spnego_principal() || strequal(principal, ADS_IGNORE_PRINCIPAL)) {
                         TALLOC_FREE(principal);
                 }
@@ -1069 +1068 @@
                                 cli->desthost)) {
                         char *realm = NULL;
-                        char *machine = NULL;
                         char *host = NULL;
-                        DEBUG(3,("cli_session_setup_spnego: got a "
-                                "bad server principal, trying to guess ...\n"));
+                        DEBUG(3,("cli_session_setup_spnego: using target "
+                                 "hostname not SPNEGO principal\n"));
 
                         host = strchr_m(cli->desthost, '.');
-                        if (host) {
-                                /* We had a '.' in the name. */
-                                machine = SMB_STRNDUP(cli->desthost,
-                                        host - cli->desthost);
-                        } else {
-                                machine = SMB_STRDUP(cli->desthost);
-                        }
-                        if (machine == NULL) {
-                                return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
-                        }
-
                         if (dest_realm) {
                                 realm = SMB_STRDUP(dest_realm);
@@ -1100 +1087 @@
 
                         if (realm && *realm) {
-                                if (host) {
-                                        /* DNS name. */
-                                        principal = talloc_asprintf(talloc_tos(),
-                                                        "cifs/%s@%s",
-                                                        cli->desthost,
-                                                        realm);
-                                } else {
-                                        /* NetBIOS name, use machine account. */
-                                        principal = talloc_asprintf(talloc_tos(),
-                                                        "%s$@%s",
-                                                        machine,
-                                                        realm);
-                                }
+                                principal = talloc_asprintf(talloc_tos(),
+                                                            "cifs/%s@%s",
+                                                            cli->desthost,
+                                                            realm);
                                 if (!principal) {
-                                        SAFE_FREE(machine);
                                         SAFE_FREE(realm);
                                         return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
@@ -1122 +1099 @@
                                         principal ? principal : "<null>"));
                         }
-                        SAFE_FREE(machine);
                         SAFE_FREE(realm);
                 }