OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[CIFS] change misleading field name 

num_auth is really num_subauth in ACL terminology

Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
Steve French 2007-10-01 19:59:01 +00:00
parent 92ad9b93cd
commit 4084973dba
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/cifs/cifsacl.c
View File

@ -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;
}

10
fs/cifs/cifsacl.h
View File

@ -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 */