From: Jeffrey Altman <jaltman@mit.edu>
Date: Sat, 24 Jul 2004 09:31:15 +0000 (+0000)
Subject: smb-extended-20040724
X-Git-Tag: openafs-devel-1_3_66~13
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e73c65900fe5285f9bbff9783d10713b2b9bdd36;p=packages%2Fo%2Fopenafs.git

smb-extended-20040724


Don't fallback to SMB_AUTH_NTLM.  Apparently, allowing SPNEGO to be
used each time prevents the failure of authentication when logged into
Windows with an external Kerberos principal mapped to a local account.
---

diff --git a/src/WINNT/afsd/smb.c b/src/WINNT/afsd/smb.c
index 1cd0645bf..3d6448e6e 100644
--- a/src/WINNT/afsd/smb.c
+++ b/src/WINNT/afsd/smb.c
@@ -7344,7 +7344,13 @@ void smb_Init(osi_log_t *logp, char *snamep, int useV3, int LANadapt,
 			   or sec package id. */
 			afsi_log("Reverting to NO SMB AUTH");
 			smb_authType = SMB_AUTH_NONE;
-		} else if ( smb_authType == SMB_AUTH_EXTENDED) {
+		} 
+#ifdef COMMENT
+        /* Don't fallback to SMB_AUTH_NTLM.  Apparently, allowing SPNEGO to be used each
+         * time prevents the failure of authentication when logged into Windows with an
+         * external Kerberos principal mapped to a local account.
+         */
+        else if ( smb_authType == SMB_AUTH_EXTENDED) {
             /* Test to see if there is anything to negotiate.  If SPNEGO is not going to be used 
             * then the only option is NTLMSSP anyway; so just fallback. 
             */
@@ -7358,6 +7364,7 @@ void smb_Init(osi_log_t *logp, char *snamep, int useV3, int LANadapt,
             } else
                 free(secBlob);
         }
+#endif
 	}
 
 	{