Changeset 745 for trunk/server/source3/modules/vfs_acl_common.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/modules/vfs_acl_common.c (modified) (18 diffs)

trunk/server/source3/modules/vfs_acl_common.c

@@ -20 +20 @@
  */
 
+
+
+
+
+
 static NTSTATUS create_acl_blob(const struct security_descriptor *psd,
                         DATA_BLOB *pblob,
@@ -35 +40 @@
                         DATA_BLOB *pblob);
 
-#define HASH_SECURITY_INFO (OWNER_SECURITY_INFORMATION | \
-                                GROUP_SECURITY_INFORMATION | \
-                                DACL_SECURITY_INFORMATION | \
-                                SACL_SECURITY_INFORMATION)
+#define HASH_SECURITY_INFO ( | \
+                                 | \
+                                 | \
+                                S)
 
 /*******************************************************************
@@ -78 +83 @@
         size_t sd_size;
 
-        ndr_err = ndr_pull_struct_blob(pblob, ctx, NULL, &xacl,
+        ndr_err = ndr_pull_struct_blob(pblob, ctx, &xacl,
                         (ndr_pull_flags_fn_t)ndr_pull_xattr_NTACL);
 
@@ -84 +89 @@
                 DEBUG(5, ("parse_acl_blob: ndr_pull_xattr_NTACL failed: %s\n",
                         ndr_errstr(ndr_err)));
-                return ndr_map_error2ntstatus(ndr_err);;
+                return ndr_map_error2ntstatus(ndr_err);
         }
 
         switch (xacl.version) {
                 case 2:
-                        *ppdesc = make_sec_desc(ctx, SEC_DESC_REVISION,
+                        *ppdesc = make_sec_desc(ctx, S_REVISION,
                                         xacl.info.sd_hs2->sd->type | SEC_DESC_SELF_RELATIVE,
                                         xacl.info.sd_hs2->sd->owner_sid,
@@ -101 +106 @@
                         break;
                 case 3:
-                        *ppdesc = make_sec_desc(ctx, SEC_DESC_REVISION,
+                        *ppdesc = make_sec_desc(ctx, S_REVISION,
                                         xacl.info.sd_hs3->sd->type | SEC_DESC_SELF_RELATIVE,
                                         xacl.info.sd_hs3->sd->owner_sid,
@@ -145 +150 @@
 
         ndr_err = ndr_push_struct_blob(
-                        pblob, ctx, NULL, &xacl,
+                        pblob, ctx, &xacl,
                         (ndr_push_flags_fn_t)ndr_push_xattr_NTACL);
 
@@ -151 +156 @@
                 DEBUG(5, ("create_acl_blob: ndr_push_xattr_NTACL failed: %s\n",
                         ndr_errstr(ndr_err)));
-                return ndr_map_error2ntstatus(ndr_err);;
+                return ndr_map_error2ntstatus(ndr_err);
         }
 
@@ -250 +255 @@
         DATA_BLOB blob;
         NTSTATUS status;
-        uint16_t hash_type;
+        uint16_t hash_type;
         uint8_t hash[XATTR_SD_HASH_SIZE];
         uint8_t hash_tmp[XATTR_SD_HASH_SIZE];
@@ -402 +407 @@
         }
 
-        if (!(security_info & OWNER_SECURITY_INFORMATION)) {
+        if (!(security_info & )) {
                 psd->owner_sid = NULL;
         }
-        if (!(security_info & GROUP_SECURITY_INFORMATION)) {
+        if (!(security_info & )) {
                 psd->group_sid = NULL;
         }
-        if (!(security_info & DACL_SECURITY_INFORMATION)) {
+        if (!(security_info & )) {
                 psd->dacl = NULL;
         }
-        if (!(security_info & SACL_SECURITY_INFORMATION)) {
+        if (!(security_info & S)) {
                 psd->sacl = NULL;
         }
@@ -444 +449 @@
         struct dom_sid *owner_sid = NULL;
         struct dom_sid *group_sid = NULL;
-        uint32_t security_info_sent = (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION);
-        size_t size;
+        uint32_t security_info_sent = (SECINFO_OWNER | SECINFO_GROUP | SECINFO_DACL);
         bool inherit_owner = lp_inherit_owner(SNUM(handle->conn));
         bool inheritable_components = sd_has_inheritable_components(parent_desc,
                                         is_directory);
+
 
         if (!inheritable_components && !inherit_owner) {
@@ -470 +475 @@
 
         if (owner_sid == NULL) {
-                owner_sid = &handle->conn->server_info->ptok->user_sids[PRIMARY_USER_SID_INDEX];
+                owner_sid = &handle->conn->sesids[PRIMARY_USER_SID_INDEX];
         }
         if (group_sid == NULL) {
-                group_sid = &handle->conn->server_info->ptok->user_sids[PRIMARY_GROUP_SID_INDEX];
+                group_sid = &handle->conn->sesids[PRIMARY_GROUP_SID_INDEX];
         }
 
@@ -566 +571 @@
         status = smb1_file_se_access_check(handle->conn,
                                         parent_desc,
-                                        handle->conn->server_info->ptok,
+                                        ,
                                         access_mask,
                                         &access_granted);
@@ -614 +619 @@
                                 NULL,
                                 fname,
-                                (OWNER_SECURITY_INFORMATION |
-                                 GROUP_SECURITY_INFORMATION |
-                                 DACL_SECURITY_INFORMATION),
+                                ( |
+                                  |
+                                 ),
                                 &pdesc);
         if (NT_STATUS_IS_OK(status)) {
@@ -622 +627 @@
                 status = smb1_file_se_access_check(handle->conn,
                                         pdesc,
-                                        handle->conn->server_info->ptok,
+                                        ,
                                         fsp->access_mask,
                                         &access_granted);
@@ -837 +842 @@
                 parent_dir, final_component ));
 
-        /* cd into the parent dir to pin it. */
+       /* cd into the parent dir to pin it. */
         ret = SMB_VFS_CHDIR(conn, parent_dir);
         if (ret == -1) {
@@ -856 +861 @@
         /* Ensure we have this file open with DELETE access. */
         id = vfs_file_id_from_sbuf(conn, &local_fname.st);
-        for (fsp = file_find_di_first(id); fsp; file_find_di_next(fsp)) {
+        for (fsp = file_find_di_first(conn->sconn, id); fsp;
+             file_find_di_next(fsp)) {
                 if (fsp->access_mask & DELETE_ACCESS &&
                                 fsp->delete_on_close) {
@@ -927 +933 @@
                                 uint32_t oplock_request,
                                 uint64_t allocation_size,
+
                                 struct security_descriptor *sd,
                                 struct ea_list *ea_list,
@@ -949 +956 @@
                                         oplock_request,
                                         allocation_size,
+
                                         sd,
                                         ea_list,