Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 339458
b: refs/heads/master
c: ee13b2b
h: refs/heads/master
v: v3
  • Loading branch information
Jeff Layton authored and Steve French committed Dec 5, 2012
1 parent 82b2acf commit 9400045
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 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: 30c9d6cca526243abe6c08eb6fa03db9d2b1a630
refs/heads/master: ee13b2ba7488475b47ae8dab2eebc4f5fd6838c5
11 changes: 4 additions & 7 deletions trunk/fs/cifs/cifsacl.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,27 +199,24 @@ static void
sid_to_str(struct cifs_sid *sidptr, char *sidstr)
{
int i;
unsigned long saval;
unsigned int saval;
char *strptr;

strptr = sidstr;

sprintf(strptr, "%s", "S");
strptr = sidstr + strlen(sidstr);

sprintf(strptr, "-%d", sidptr->revision);
sprintf(strptr, "S-%hhu", sidptr->revision);
strptr = sidstr + strlen(sidstr);

for (i = 0; i < NUM_AUTHS; ++i) {
if (sidptr->authority[i]) {
sprintf(strptr, "-%d", sidptr->authority[i]);
sprintf(strptr, "-%hhu", sidptr->authority[i]);
strptr = sidstr + strlen(sidstr);
}
}

for (i = 0; i < sidptr->num_subauth; ++i) {
saval = le32_to_cpu(sidptr->sub_auth[i]);
sprintf(strptr, "-%ld", saval);
sprintf(strptr, "-%u", saval);
strptr = sidstr + strlen(sidstr);
}
}
Expand Down

0 comments on commit 9400045

Please sign in to comment.