Changeset 733 for branches/samba-3.5.x/source3/modules

Timestamp:

Nov 12, 2012, 5:09:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.13

Location:

branches/samba-3.5.x/source3/modules

Files:

• vfs_acl_common.c (modified) (7 diffs)
• vfs_commit.c (modified) (1 diff)

branches/samba-3.5.x/source3/modules/vfs_acl_common.c

@@ -374 +374 @@
                         }
                 }
-                is_directory = S_ISDIR(sbuf.st_ex_mode);
+                is_directory = S_ISDIR(psbuf->st_ex_mode);
 
                 if (ignore_file_system_acl) {
@@ -409 +409 @@
         }
         if (!(security_info & DACL_SECURITY_INFORMATION)) {
+                psd->type &= ~SEC_DESC_DACL_PRESENT;
                 psd->dacl = NULL;
         }
         if (!(security_info & SACL_SECURITY_INFORMATION)) {
+                psd->type &= ~SEC_DESC_SACL_PRESENT;
                 psd->sacl = NULL;
         }
@@ -533 +535 @@
                                         (SECINFO_OWNER |
                                          SECINFO_GROUP |
-                                         SECINFO_DACL),
+                                         SECINFO_DACL  |
+                                         SECINFO_SACL),
                                         pp_parent_desc);
 
@@ -616 +619 @@
                                 (OWNER_SECURITY_INFORMATION |
                                  GROUP_SECURITY_INFORMATION |
-                                 DACL_SECURITY_INFORMATION),
+                                 DACL_SECURITY_INFORMATION  |
+                                 SACL_SECURITY_INFORMATION),
                                 &pdesc);
         if (NT_STATUS_IS_OK(status)) {
@@ -627 +631 @@
                 if (!NT_STATUS_IS_OK(status)) {
                         DEBUG(10,("open_acl_xattr: %s open "
+                                "for access 0x%x (0x%x) "
                                 "refused with error %s\n",
                                 fsp_str_dbg(fsp),
+                                (unsigned int)fsp->access_mask,
+                                (unsigned int)access_granted,
                                 nt_errstr(status) ));
                         goto err;
@@ -912 +919 @@
         int ret;
 
+        /* Try the normal rmdir first. */
         ret = SMB_VFS_NEXT_RMDIR(handle, path);
-        if (!(ret == -1 && (errno == EACCES || errno == EPERM))) {
-                DEBUG(10,("rmdir_acl_common: unlink of %s failed %s\n",
-                        path,
-                        strerror(errno) ));
-                return ret;
-        }
-
-        return acl_common_remove_object(handle,
-                                        path,
-                                        true);
+        if (ret == 0) {
+                return 0;
+        }
+        if (errno == EACCES || errno == EPERM) {
+                /* Failed due to access denied,
+                   see if we need to root override. */
+                return acl_common_remove_object(handle,
+                                                path,
+                                                true);
+        }
+
+        DEBUG(10,("rmdir_acl_common: unlink of %s failed %s\n",
+                path,
+                strerror(errno) ));
+        return -1;
 }
 
@@ -1040 +1053 @@
         int ret;
 
+        /* Try the normal unlink first. */
         ret = SMB_VFS_NEXT_UNLINK(handle, smb_fname);
-        if (!(ret == -1 && (errno == EACCES || errno == EPERM))) {
-                DEBUG(10,("unlink_acl_common: unlink of %s failed %s\n",
-                        smb_fname->base_name,
-                        strerror(errno) ));
-                return ret;
-        }
-        /* Don't do anything fancy for streams. */
-        if (smb_fname->stream_name) {
-                return ret;
-        }
-
-        return acl_common_remove_object(handle,
+        if (ret == 0) {
+                return 0;
+        }
+        if (errno == EACCES || errno == EPERM) {
+                /* Failed due to access denied,
+                   see if we need to root override. */
+
+                /* Don't do anything fancy for streams. */
+                if (smb_fname->stream_name) {
+                        return -1;
+                }
+                return acl_common_remove_object(handle,
                                         smb_fname->base_name,
                                         false);
+        }
+
+        DEBUG(10,("unlink_acl_common: unlink of %s failed %s\n",
+                smb_fname->base_name,
+                strerror(errno) ));
+        return -1;
 }
 

branches/samba-3.5.x/source3/modules/vfs_commit.c

@@ -232 +232 @@
         }
 
-        return 0;
+        return fd;
 }