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

Commit 454ac778 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable 

* master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6-stable:
  [CIFS] Fix compile error when CONFIG_CIFS_EXPERIMENTAL is undefined
parents 18118cdb 301dc3e6

fs/cifs/connect.c

+4 −1
Original line number Diff line number Diff line
@@ -3447,10 +3447,13 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, 
			pSesInfo->server->secMode,

			pSesInfo->server->capabilities,

			pSesInfo->server->timeZone));

#ifdef CONFIG_CIFS_EXPERIMENTAL

		if(experimEnabled > 1)

			rc = CIFS_SessSetup(xid, pSesInfo, CIFS_NTLM /* type */,

					    &ntlmv2_flag, nls_info);	

		else if (extended_security

		else

#endif

		if (extended_security

				&& (pSesInfo->capabilities & CAP_EXTENDED_SECURITY)

				&& (pSesInfo->server->secType == NTLMSSP)) {

			cFYI(1, ("New style sesssetup"));