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

Commit 4084973d authored by Steve French's avatar Steve French
Browse files

[CIFS] change misleading field name 



num_auth is really num_subauth in ACL terminology

Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent 92ad9b93

fs/cifs/cifsacl.c

+2 −2
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ static int parse_sid(struct cifs_sid *psid, char *end_of_acl) 
	}

#ifdef CONFIG_CIFS_DEBUG2

	cFYI(1, ("revision %d num_auth %d First subauth 0x%x",

		psid->revision, psid->num_auth, psid->sub_auth[0]));

		psid->revision, psid->num_subauth, psid->sub_auth[0]));



	/* BB add length check to make sure that we do not have huge num auths

	      and therefore go off the end */

	cFYI(1, ("RID 0x%x", le32_to_cpu(psid->sub_auth[psid->num_auth])));

	cFYI(1, ("RID 0x%x", le32_to_cpu(psid->sub_auth[psid->num_subauth])));

#endif

	return 0;

}

fs/cifs/cifsacl.h

+4 −6
Original line number Diff line number Diff line
@@ -33,10 +33,9 @@ struct cifs_ntsd { 


struct cifs_sid {

	__u8 revision; /* revision level */

	__u8 num_auth;

	__u8 num_subauth;

	__u8 authority[6];

	__u32 sub_auth[4];

	__u32 rid;

	__u32 sub_auth[0]; /* sub_auth[num_subauth] */

} __attribute__((packed));



struct cifs_acl {
@@ -54,10 +53,9 @@ struct cifs_ntace { 


struct cifs_ace {

	__u8 revision; /* revision level */

	__u8 num_auth;

	__u8 num_subauth;

	__u8 authority[6];

	__u32 sub_auth[4];

	__u32 rid;

	__u32 sub_auth[0];

} __attribute__((packed));



/* everyone */