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

Commit 04912d6a authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: rename "extended_security" to "global_secflags" 



...since that more accurately describes what that variable holds.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent d00c28de

fs/cifs/cifs_debug.c

+7 −7
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ static const struct file_operations cifs_multiuser_mount_proc_fops = { 


static int cifs_security_flags_proc_show(struct seq_file *m, void *v)

{

	seq_printf(m, "0x%x\n", extended_security);

	seq_printf(m, "0x%x\n", global_secflags);

	return 0;

}
@@ -744,10 +744,10 @@ static ssize_t cifs_security_flags_proc_write(struct file *file, 
		/* single char or single char followed by null */

		c = flags_string[0];

		if (c == '0' || c == 'n' || c == 'N') {

			extended_security = CIFSSEC_DEF; /* default */

			global_secflags = CIFSSEC_DEF; /* default */

			return count;

		} else if (c == '1' || c == 'y' || c == 'Y') {

			extended_security = CIFSSEC_MAX;

			global_secflags = CIFSSEC_MAX;

			return count;

		} else if (!isdigit(c)) {

			cERROR(1, "invalid flag %c", c);
@@ -771,12 +771,12 @@ static ssize_t cifs_security_flags_proc_write(struct file *file, 
		return -EINVAL;

	}

	/* flags look ok - update the global security flags for cifs module */

	extended_security = flags;

	if (extended_security & CIFSSEC_MUST_SIGN) {

	global_secflags = flags;

	if (global_secflags & CIFSSEC_MUST_SIGN) {

		/* requiring signing implies signing is allowed */

		extended_security |= CIFSSEC_MAY_SIGN;

		global_secflags |= CIFSSEC_MAY_SIGN;

		cFYI(1, "packet signing now required");

	} else if ((extended_security & CIFSSEC_MAY_SIGN) == 0) {

	} else if ((global_secflags & CIFSSEC_MAY_SIGN) == 0) {

		cFYI(1, "packet signing disabled");

	}

	/* BB should we turn on MAY flags for other MUST options? */

fs/cifs/cifsencrypt.c

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ void calc_lanman_hash(const char *password, const char *cryptkey, bool encrypt, 
	if (password)

		strncpy(password_with_pad, password, CIFS_ENCPWD_SIZE);



	if (!encrypt && extended_security & CIFSSEC_MAY_PLNTXT) {

	if (!encrypt && global_secflags & CIFSSEC_MAY_PLNTXT) {

		memset(lnm_session_key, 0, CIFS_SESS_KEY_SIZE);

		memcpy(lnm_session_key, password_with_pad,

			CIFS_ENCPWD_SIZE);

fs/cifs/cifsfs.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ unsigned int experimEnabled = 0; 
unsigned int linuxExtEnabled = 1;

unsigned int lookupCacheEnabled = 1;

unsigned int multiuser_mount = 0;

unsigned int extended_security = CIFSSEC_DEF;

unsigned int global_secflags = CIFSSEC_DEF;

/* unsigned int ntlmv2_support = 0; */

unsigned int sign_CIFS_PDUs = 1;

static const struct super_operations cifs_super_ops;

fs/cifs/cifsglob.h

+1 −1
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ GLOBAL_EXTERN unsigned int multiuser_mount; /* if enabled allows new sessions 
GLOBAL_EXTERN unsigned int oplockEnabled;

GLOBAL_EXTERN unsigned int experimEnabled;

GLOBAL_EXTERN unsigned int lookupCacheEnabled;

GLOBAL_EXTERN unsigned int extended_security;	/* if on, session setup sent

GLOBAL_EXTERN unsigned int global_secflags;	/* if on, session setup sent

				with more secure ntlmssp2 challenge/resp */

GLOBAL_EXTERN unsigned int sign_CIFS_PDUs;  /* enable smb packet signing */

GLOBAL_EXTERN unsigned int linuxExtEnabled;/*enable Linux/Unix CIFS extensions*/

fs/cifs/cifssmb.c

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ CIFSSMBNegotiate(unsigned int xid, struct cifsSesInfo *ses) 
	if (ses->overrideSecFlg & (~(CIFSSEC_MUST_SIGN | CIFSSEC_MUST_SEAL)))

		secFlags = ses->overrideSecFlg;  /* BB FIXME fix sign flags? */

	else /* if override flags set only sign/seal OR them with global auth */

		secFlags = extended_security | ses->overrideSecFlg;

		secFlags = global_secflags | ses->overrideSecFlg;



	cFYI(1, "secFlags 0x%x", secFlags);