r25400: Windows 2008 (Longhorn) Interop fixes for AD specific auth2 flags,

and client fixes.  Patch from Todd Stetcher <todd.stetcher@isilon.com>.
(This used to be commit 8304ccba7346597425307e260e88647e49081f68)

1 files changed, 28 insertions, 10 deletions

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 820a904ea4..a4bbf9a6ec 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -822,20 +822,36 @@ ADS_STATUS cli_session_setup_spnego(struct cli_state *cli, const char *user,
 		free(OIDs[i]);
 	}
 
-	DEBUG(3,("got principal=%s\n", principal ? principal : "<null>"));
 
 	if (got_kerberos_mechanism && (principal == NULL)) {
+		fstring dns_name;
+		fstring nb_name;
+
 		/*
-		 * It is WRONG to depend on the principal sent in the negprot
-		 * reply, but right now we do it. So for safety (don't
-		 * segfault later) disable Kerberos when no principal was
-		 * sent. -- VL
-		 */
-		DEBUG(1, ("Kerberos mech was offered, but no principal was "
-			  "sent, disabling Kerberos\n"));
-		cli->use_kerberos = False;
+		 * We didn't get a valid principal in the negTokenInit.  Fake
+		 * it, or fall back on NTLM. We prefer to fake it, and hit the
+		 * translate_name cache to get a REAL realm name.
+		 */ 
+		if (!(cli->desthost && translate_name(domain, dns_name,
+			    nb_name) && 
+		    asprintf(&principal, "host/%s@%s", cli->desthost, 
+			dns_name))) {
+
+			/*
+			 * It is WRONG to depend on the principal sent in the
+			 * negprot reply, but right now we do it. So for safety
+			 * (don't segfault later) disable Kerberos when no 
+			 * principal was sent. -- VL
+			 */
+			DEBUG(1, ("Kerberos mech was offered, but no principal was "
+				"sent, disabling Kerberos\n"));
+			cli->use_kerberos = False;
+		}
+
 	}
 
+	DEBUG(3,("got principal=%s\n", principal ? principal : "<null>"));
+
 	fstrcpy(cli->user_name, user);
 
 #ifdef HAVE_KRB5
@@ -872,7 +888,9 @@ ADS_STATUS cli_session_setup_spnego(struct cli_state *cli, const char *user,
 
 ntlmssp:
 
-	return ADS_ERROR_NT(cli_session_setup_ntlmssp(cli, user, pass, domain));
+	/* NTLM is sensitive to adding a domain with a UPN */
+	return ADS_ERROR_NT(cli_session_setup_ntlmssp(cli, user, pass,
+	       	(strchr(user, '@') ? NULL : domain)));
 }
 
 /****************************************************************************