Changeset 124 for branches/samba-3.0/source/libsmb/cliconnect.c

Timestamp:

Mar 12, 2008, 9:08:18 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.28a

File:

• branches/samba-3.0/source/libsmb/cliconnect.c (modified) (7 diffs)

branches/samba-3.0/source/libsmb/cliconnect.c

@@ -41 +41 @@
 };
 
+static const char *star_smbserver_name = "*SMBSERVER";
+
 /**
  * Set the user session key for a connection
@@ -629 +631 @@
                 data_blob_free(&negTokenTarg);
                 data_blob_free(&session_key_krb5);
-                ADS_ERROR_NT(cli_nt_error(cli));
+                return ADS_ERROR_NT(cli_nt_error(cli));
         }
 
@@ -862 +864 @@
                 }
                 
-                rc = cli_session_setup_kerberos(cli, principal, domain);
-                if (ADS_ERR_OK(rc) || !cli->fallback_after_kerberos) {
+                /* If we get a bad principal, try to guess it if
+                   we have a valid host NetBIOS name.
+                 */
+                if (strequal(principal, ADS_IGNORE_PRINCIPAL)) {
                         SAFE_FREE(principal);
-                        return rc;
+                }
+                if (principal == NULL &&
+                        !is_ipaddress(cli->desthost) &&
+                        !strequal(star_smbserver_name,
+                                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"));
+
+                        host = strchr_m(cli->desthost, '.');
+                        if (host) {
+                                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);
+                        }
+
+                        realm = kerberos_get_default_realm_from_ccache();
+                        if (realm && *realm) {
+                                if (asprintf(&principal, "%s$@%s",
+                                                machine, realm) < 0) {
+                                        SAFE_FREE(machine);
+                                        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(machine);
+                        SAFE_FREE(realm);
+                }
+
+                if (principal) {
+                        rc = cli_session_setup_kerberos(cli, principal, domain);
+                        if (ADS_ERR_OK(rc) || !cli->fallback_after_kerberos) {
+                                SAFE_FREE(principal);
+                                return rc;
+                        }
                 }
         }
@@ -1413 +1460 @@
 
         /* reasonable default hostname */
-        if (!host) host = "*SMBSERVER";
+        if (!host) host = star_smbserver_name;
 
         fstrcpy(cli->desthost, host);
@@ -1528 +1575 @@
                         goto again;
                 }
-                if (strcmp(called.name, "*SMBSERVER")) {
-                        make_nmb_name(&called , "*SMBSERVER", 0x20);
+                if (strcmp(called.name, star_smbserver_name)) {
+                        make_nmb_name(&called , star_smbserver_name, 0x20);
                         goto again;
                 }
@@ -1653 +1700 @@
 
         if(is_ipaddress(desthost)) {
-                make_nmb_name(&called, "*SMBSERVER", 0x20);
+                make_nmb_name(&called, star_smbserver_name, 0x20);
         } else {
                 make_nmb_name(&called, desthost, 0x20);
@@ -1662 +1709 @@
                 struct nmb_name smbservername;
 
-                make_nmb_name(&smbservername , "*SMBSERVER", 0x20);
+                make_nmb_name(&smbservername, star_smbserver_name, 0x20);
 
                 /*