Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 231979
b: refs/heads/master
c: 2fbc2f1
h: refs/heads/master
i:
  231977: 461010c
  231975: 1240a8b
v: v3
  • Loading branch information
Shirish Pargaonkar authored and Steve French committed Jan 19, 2011
1 parent 5cfbe40 commit ecd9d5a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 540b2e377797d8715469d408b887baa9310c5f3e
refs/heads/master: 2fbc2f1729e785a7b2faf9d8d60926bb1ff62af0
13 changes: 11 additions & 2 deletions trunk/fs/cifs/cifsacl.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,12 @@ static struct cifs_wksid wksidarr[NUM_WK_SIDS] = {
;


/* security id for everyone */
/* security id for everyone/world system group */
static const struct cifs_sid sid_everyone = {
1, 1, {0, 0, 0, 0, 0, 1}, {0} };
/* security id for Authenticated Users system group */
static const struct cifs_sid sid_authusers = {
1, 1, {0, 0, 0, 0, 0, 5}, {11} };
/* group users */
static const struct cifs_sid sid_user = {1, 2 , {0, 0, 0, 0, 0, 5}, {} };

Expand Down Expand Up @@ -365,7 +368,7 @@ static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl,
if (num_aces > 0) {
umode_t user_mask = S_IRWXU;
umode_t group_mask = S_IRWXG;
umode_t other_mask = S_IRWXO;
umode_t other_mask = S_IRWXU | S_IRWXG | S_IRWXO;

ppace = kmalloc(num_aces * sizeof(struct cifs_ace *),
GFP_KERNEL);
Expand All @@ -390,6 +393,12 @@ static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl,
ppace[i]->type,
&fattr->cf_mode,
&other_mask);
if (compare_sids(&(ppace[i]->sid), &sid_authusers))
access_flags_to_mode(ppace[i]->access_req,
ppace[i]->type,
&fattr->cf_mode,
&other_mask);


/* memcpy((void *)(&(cifscred->aces[i])),
(void *)ppace[i],
Expand Down

0 comments on commit ecd9d5a

Please sign in to comment.