aboutsummaryrefslogtreecommitdiff
path: root/fs/cifs/cifssmb.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2007-09-25 16:17:24 +0000
committerSteve French <sfrench@us.ibm.com>2007-09-25 16:17:24 +0000
commitbcb020341a7d0fba6cd025f068d40f4ab5c36af8 (patch)
tree5ef6c01a6ade5fbe5e87940958be31a5e370de68 /fs/cifs/cifssmb.c
parent442aa310f3bc49cf4e059da790fbae62411d50db (diff)
[CIFS] move cifs acl code to new file and fix build break
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifssmb.c')
-rw-r--r--fs/cifs/cifssmb.c107
1 files changed, 0 insertions, 107 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 46c2bb455124..cc05a26ab07a 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -3040,113 +3040,6 @@ GetExtAttrOut:
#endif /* CONFIG_POSIX */
-
-/* security id for everyone */
-static const struct cifs_sid sid_everyone =
- {1, 1, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0}};
-/* group users */
-static const struct cifs_sid sid_user =
- {1, 2 , {0, 0, 0, 0, 0, 5}, {32, 545, 0, 0}};
-
-static void parse_sid(struct cifs_sid * psid, char * end_of_acl)
-{
- /* BB need to add parm so we can store the SID BB */
-
- /* validate that we do not go past end of acl */
- if (end_of_acl < (char *)psid + sizeof(struct cifs_sid)) {
- cERROR(1, ("ACL to small to parse SID"));
- return;
- }
-#ifdef CONFIG_CIFS_DEBUG2
- cFYI(1, ("revision %d num_auth %d First subauth 0x%x",
- psid->revision, psid->num_auth, 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])));
-#endif
- return;
-}
-
-/* Convert CIFS ACL to POSIX form */
-static int parse_sec_desc(struct cifs_ntsd *pntsd, int acl_len)
-{
- int i;
- int num_aces = 0;
- int acl_size;
- struct cifs_sid *owner_sid_ptr, *group_sid_ptr;
- struct cifs_acl *dacl_ptr; /* no need for SACL ptr */
- struct cifs_ntace **ppntace;
- struct cifs_ace **ppace;
- char *acl_base;
- char *end_of_acl = ((char *)pntsd) + acl_len;
-
- owner_sid_ptr = (struct cifs_sid *)((char *)pntsd +
- cpu_to_le32(pntsd->osidoffset));
- group_sid_ptr = (struct cifs_sid *)((char *)pntsd +
- cpu_to_le32(pntsd->gsidoffset));
- dacl_ptr = (struct cifs_acl *)((char *)pntsd +
- cpu_to_le32(pntsd->dacloffset));
-#ifdef CONFIG_CIFS_DEBUG2
- cFYI(1,("revision %d type 0x%x ooffset 0x%x goffset 0x%x "
- "sacloffset 0x%x dacloffset 0x%x", pntsd->revision, pntsd->type,
- pntsd->osidoffset, pntsd->gsidoffset, pntsd->sacloffset,
- pntsd->dacloffset));
-#endif
- parse_sid(owner_sid_ptr, end_of_acl);
- parse_sid(group_sid_ptr, end_of_acl);
-
-/* cifscred->uid = owner_sid_ptr->rid;
- cifscred->gid = group_sid_ptr->rid;
- memcpy((void *)(&(cifscred->osid)), (void *)owner_sid_ptr,
- sizeof (struct cifs_sid));
- memcpy((void *)(&(cifscred->gsid)), (void *)group_sid_ptr,
- sizeof (struct cifs_sid)); */
-
- num_aces = cpu_to_le32(dacl_ptr->num_aces);
- cFYI(1, ("num aces %d", num_aces));
- if (num_aces > 0) {
- ppntace = kmalloc(num_aces * sizeof(struct cifs_ntace *),
- GFP_KERNEL);
- ppace = kmalloc(num_aces * sizeof(struct cifs_ace *),
- GFP_KERNEL);
-
-/* cifscred->cecount = dacl_ptr->num_aces;
- cifscred->ntaces = kmalloc(num_aces *
- sizeof(struct cifs_ntace *), GFP_KERNEL);
- cifscred->aces = kmalloc(num_aces *
- sizeof(struct cifs_ace *), GFP_KERNEL);*/
-
- acl_base = (char *)dacl_ptr;
- acl_size = sizeof(struct cifs_acl);
-
- for (i = 0; i < num_aces; ++i) {
- ppntace[i] = (struct cifs_ntace *)
- (acl_base + acl_size);
- ppace[i] = (struct cifs_ace *)
- ((char *)ppntace[i] +
- sizeof(struct cifs_ntace));
-
-/* memcpy((void *)(&(cifscred->ntaces[i])),
- (void *)ntace_ptrptr[i],
- sizeof(struct cifs_ntace));
- memcpy((void *)(&(cifscred->aces[i])),
- (void *)ace_ptrptr[i],
- sizeof(struct cifs_ace)); */
-
- acl_base = (char *)ppntace[i];
- acl_size = cpu_to_le32(ppntace[i]->size);
-#ifdef CONFIG_CIFS_DEBUG2
- cFYI(1, ("ACE revision:%d", ppace[i]->revision));
- }
-#endif
- kfree(ppace);
- kfree(ppntace);
- }
-
- return (0);
-}
-
/* Get Security Descriptor (by handle) from remote server for a file or dir */
int
CIFSSMBGetCIFSACL(const int xid, struct cifsTconInfo *tcon, __u16 fid,