Changeset 233 for branches/samba-3.2.x/source/modules

Timestamp:

May 27, 2009, 11:39:15 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.9

Location:

branches/samba-3.2.x/source/modules

Files:

• nfs4_acls.c (modified) (3 diffs)
• vfs_default.c (modified) (1 diff)
• vfs_streams_depot.c (modified) (4 diffs)
• vfs_streams_xattr.c (modified) (3 diffs)

branches/samba-3.2.x/source/modules/nfs4_acls.c

@@ -204 +204 @@
         DOM_SID *psid_owner, /* in */
         DOM_SID *psid_group, /* in */
+        bool is_directory, /* in */
         SEC_ACE **ppnt_ace_list, /* out */
         int *pgood_aces /* out */
@@ -262 +263 @@
                            sid_string_dbg(&sid)));
 
+                if (is_directory && (ace->aceMask & SMB_ACE4_ADD_FILE)) {
+                        ace->aceMask |= SMB_ACE4_DELETE_CHILD;
+                }
                 init_sec_access(&mask, ace->aceMask);
                 init_sec_ace(&nt_ace_list[good_aces++], &sid,
@@ -293 +297 @@
         gid_to_sid(&sid_group, sbuf->st_gid);
 
-        if (smbacl4_nfs42win(mem_ctx, acl, &sid_owner, &sid_group, &nt_ace_list, &good_aces)==False) {
+        if (smbacl4_nfs42win(mem_ctx, acl, &sid_owner, &sid_group, S_ISDIR(sbuf->st_mode),
+                                &nt_ace_list, &good_aces)==False) {
                 DEBUG(8,("smbacl4_nfs42win failed\n"));
                 return map_nt_error_from_unix(errno);

branches/samba-3.2.x/source/modules/vfs_default.c

@@ -671 +671 @@
                 times.actime = convert_timespec_to_time_t(ts[0]);
                 times.modtime = convert_timespec_to_time_t(ts[1]);
-                result = utime(path, times);
+                result = utime(path, &times);
         } else {
                 result = utime(path, NULL);

branches/samba-3.2.x/source/modules/vfs_streams_depot.c

@@ -79 +79 @@
         DEBUG(10, ("file_is_valid (%s) called\n", path));
 
-        if (SMB_VFS_NEXT_GETXATTR(handle, path, SAMBA_XATTR_MARKER,
+        if (SMB_VFS_GETXATTR(handle->conn, path, SAMBA_XATTR_MARKER,
                                   &buf, sizeof(buf)) != sizeof(buf)) {
                 DEBUG(10, ("GETXATTR failed: %s\n", strerror(errno)));
@@ -105 +105 @@
         DEBUG(10, ("marking file %s as valid\n", path));
 
-        ret = SMB_VFS_NEXT_SETXATTR(handle, path, SAMBA_XATTR_MARKER,
+        ret = SMB_VFS_SETXATTR(handle->conn, path, SAMBA_XATTR_MARKER,
                                     &buf, sizeof(buf), 0);
 
@@ -496 +496 @@
          */
 
-        if (SMB_VFS_NEXT_STAT(handle, fname, &sbuf) == -1) {
+        if (lp_posix_pathnames()) {
+                ret = SMB_VFS_NEXT_LSTAT(handle, fname, &sbuf);
+        } else {
+                ret = SMB_VFS_NEXT_STAT(handle, fname, &sbuf);
+        }
+
+        if (ret == -1) {
                 return -1;
         }
@@ -680 +686 @@
                         return NT_STATUS_INVALID_PARAMETER;
                 }
-                ret = SMB_VFS_NEXT_STAT(handle, fname, &sbuf);
+                if (lp_posix_pathnames()) {
+                        ret = SMB_VFS_NEXT_LSTAT(handle, fname, &sbuf);
+                } else {
+                        ret = SMB_VFS_NEXT_STAT(handle, fname, &sbuf);
+                }
         }
 

branches/samba-3.2.x/source/modules/vfs_streams_xattr.c

@@ -136 +136 @@
                                SMB_STRUCT_STAT *sbuf)
 {
+        int ret = -1;
         struct stream_io *io = (struct stream_io *)
                 VFS_FETCH_FSP_EXTENSION(handle, fsp);
@@ -149 +150 @@
         }
 
-        if (SMB_VFS_STAT(handle->conn, io->base, sbuf) == -1) {
+        if (lp_posix_pathnames()) {
+                ret = SMB_VFS_LSTAT(handle->conn, io->base, sbuf);
+        } else {
+                ret = SMB_VFS_STAT(handle->conn, io->base, sbuf);
+        }
+
+        if (ret == -1) {
                 return -1;
         }
@@ -719 +726 @@
                         return NT_STATUS_INVALID_PARAMETER;
                 }
-                ret = SMB_VFS_STAT(handle->conn, fname, &sbuf);
+                if (lp_posix_pathnames()) {
+                        ret = SMB_VFS_LSTAT(handle->conn, fname, &sbuf);
+                } else {
+                        ret = SMB_VFS_STAT(handle->conn, fname, &sbuf);
+                }
         }