[CIFS] default ntlmv2 for cifs mount delayed to 3.3

smfrench · smfrench · commit 225de11e31c1 · 2012-01-04T07:54:40.000-06:00
Turned out the ntlmv2 (default security authentication)
upgrade was harder to test than expected, and we ran
out of time to test against Apple and a few other servers
that we wanted to.  Delay upgrade of default security
from ntlm to ntlmv2 (on mount) to 3.3.  Still works
fine to specify it explicitly via "sec=ntlmv2" so this
should be fine.

Acked-by: Jeff Layton &lt;jlayton@samba.org&gt;
Signed-off-by: Steve French &lt;smfrench@gmail.com&gt;
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
@@ -2122,7 +2122,7 @@ cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb_vol *volume_info)
 		warned_on_ntlm = true;
 		cERROR(1, "default security mechanism requested.  The default "
 			"security mechanism will be upgraded from ntlm to "
-			"ntlmv2 in kernel release 3.2");
+			"ntlmv2 in kernel release 3.3");
 	}
 	ses->overrideSecFlg = volume_info->secFlg;
 

Original file line number	Diff line number	Diff line change
`@@ -2122,7 +2122,7 @@ cifs_get_smb_ses(struct TCP_Server_Info server, struct smb_vol volume_info)`
`2122`	`2122`	`warned_on_ntlm = true;`
`2123`	`2123`	`cERROR(1, "default security mechanism requested. The default "`
`2124`	`2124`	`"security mechanism will be upgraded from ntlm to "`
`2125`		`- "ntlmv2 in kernel release 3.2");`
	`2125`	`+ "ntlmv2 in kernel release 3.3");`
`2126`	`2126`	`}`
`2127`	`2127`	`ses->overrideSecFlg = volume_info->secFlg;`
`2128`	`2128`