Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65112dcc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.samba.org/sfrench/cifs-2.6 

* git://git.samba.org/sfrench/cifs-2.6:
  [CIFS] Fix first time message on mount, ntlmv2 upgrade delayed to 3.2
parents bbf5e974 9d1e397b

fs/cifs/connect.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2018,7 +2018,7 @@ cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb_vol *volume_info) 
		warned_on_ntlm = true;

		warned_on_ntlm = true;

		cERROR(1, "default security mechanism requested.  The default "

		cERROR(1, "default security mechanism requested.  The default "

			"security mechanism will be upgraded from ntlm to "

			"security mechanism will be upgraded from ntlm to "

			"ntlmv2 in kernel release 3.1");

			"ntlmv2 in kernel release 3.2");

	}

	}

	ses->overrideSecFlg = volume_info->secFlg;

	ses->overrideSecFlg = volume_info->secFlg;