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

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

Location:

branches/samba-3.2.x/source/modules

Files:

• nfs4_acls.c (modified) (2 diffs)
• vfs_default.c (modified) (1 diff)
• vfs_fileid.c (modified) (1 diff)
• vfs_full_audit.c (modified) (3 diffs)
• vfs_streams_depot.c (modified) (5 diffs)
• vfs_streams_xattr.c (modified) (2 diffs)

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

@@ -704 +704 @@
 
         SMB_STRUCT_STAT sbuf;
-        bool need_chown = False;
+        bool set_acl_as_root = false;
         uid_t newUID = (uid_t)-1;
         gid_t newGID = (gid_t)-1;
+        int saved_errno;
 
         DEBUG(10, ("smb_set_nt_acl_nfs4 invoked for %s\n", fsp->fsp_name));
@@ -734 +735 @@
                 if (((newUID != (uid_t)-1) && (sbuf.st_uid != newUID)) ||
                     ((newGID != (gid_t)-1) && (sbuf.st_gid != newGID))) {
-                        need_chown = True;
-                }
-                if (need_chown) {
-                        if ((newUID == (uid_t)-1 || newUID == current_user.ut.uid)) {
-                                if(try_chown(fsp->conn, fsp->fsp_name, newUID, newGID)) {
-                                        DEBUG(3,("chown %s, %u, %u failed. Error = %s.\n",
-                                                 fsp->fsp_name, (unsigned int)newUID, (unsigned int)newGID, 
-                                                 strerror(errno)));
-                                        return map_nt_error_from_unix(errno);
-                                }
-
-                                DEBUG(10,("chown %s, %u, %u succeeded.\n",
-                                          fsp->fsp_name, (unsigned int)newUID, (unsigned int)newGID));
-                                if (smbacl4_GetFileOwner(fsp->conn, fsp->fsp_name, &sbuf))
-                                        return map_nt_error_from_unix(errno);
-                                need_chown = False;
-                        } else { /* chown is needed, but _after_ changing acl */
-                                sbuf.st_uid = newUID; /* OWNER@ in case of e_special */
-                                sbuf.st_gid = newGID; /* GROUP@ in case of e_special */
-                        }
-                }
-        }
-
-        if ((security_info_sent & DACL_SECURITY_INFORMATION)!=0 && psd->dacl!=NULL)
-        {
-                acl = smbacl4_win2nfs4(fsp->fsp_name, psd->dacl, &params, sbuf.st_uid, sbuf.st_gid);
-                if (!acl)
-                        return map_nt_error_from_unix(errno);
-
-                smbacl4_dump_nfs4acl(10, acl);
-
-                result = set_nfs4_native(fsp, acl);
-                if (result!=True)
-                {
-                        DEBUG(10, ("set_nfs4_native failed with %s\n", strerror(errno)));
-                        return map_nt_error_from_unix(errno);
-                }
-        } else
+                        if(try_chown(fsp->conn, fsp->fsp_name, newUID, newGID)) {
+                                DEBUG(3,("chown %s, %u, %u failed. Error = %s.\n",
+                                         fsp->fsp_name, (unsigned int)newUID, (unsigned int)newGID, 
+                                         strerror(errno)));
+                                return map_nt_error_from_unix(errno);
+                        }
+
+                        DEBUG(10,("chown %s, %u, %u succeeded.\n",
+                                  fsp->fsp_name, (unsigned int)newUID, (unsigned int)newGID));
+                        if (smbacl4_GetFileOwner(fsp->conn, fsp->fsp_name, &sbuf))
+                                return map_nt_error_from_unix(errno);
+                        /* If we successfully chowned, we know we must
+                         * be able to set the acl, so do it as root.
+                         */
+                        set_acl_as_root = true;
+                }
+        }
+
+        if (!(security_info_sent & DACL_SECURITY_INFORMATION) || psd->dacl ==NULL) {
                 DEBUG(10, ("no dacl found; security_info_sent = 0x%x\n", security_info_sent));
-
-        /* Any chown pending? */
-        if (need_chown) {
-                DEBUG(3,("chown#2 %s. uid = %u, gid = %u.\n",
-                         fsp->fsp_name, (unsigned int)newUID, (unsigned int)newGID));
-                if (try_chown(fsp->conn, fsp->fsp_name, newUID, newGID)) {
-                        DEBUG(2,("chown#2 %s, %u, %u failed. Error = %s.\n",
-                                 fsp->fsp_name, (unsigned int)newUID, (unsigned int)newGID,
-                                 strerror(errno)));
-                        return map_nt_error_from_unix(errno);
-                }
-                DEBUG(10,("chown#2 %s, %u, %u succeeded.\n",
-                          fsp->fsp_name, (unsigned int)newUID, (unsigned int)newGID));
+                return NT_STATUS_OK;
+        }
+
+        acl = smbacl4_win2nfs4(fsp->fsp_name, psd->dacl, &params, sbuf.st_uid, sbuf.st_gid);
+        if (!acl)
+                return map_nt_error_from_unix(errno);
+
+        smbacl4_dump_nfs4acl(10, acl);
+
+        if (set_acl_as_root) {
+                become_root();
+        }
+        result = set_nfs4_native(fsp, acl);
+        saved_errno = errno;
+        if (set_acl_as_root) {
+                unbecome_root();
+        }
+        if (result!=True) {
+                errno = saved_errno;
+                DEBUG(10, ("set_nfs4_native failed with %s\n", strerror(errno)));
+                return map_nt_error_from_unix(errno);
         }
 

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

@@ -715 +715 @@
                 return sys_ftruncate(fsp->fh->fd, len);
 
+        /* available disk space is enough or not? */
+        if (lp_strict_allocate(SNUM(fsp->conn))){
+                SMB_BIG_UINT space_avail;
+                SMB_BIG_UINT bsize,dfree,dsize;
+
+                space_avail = get_dfree_info(fsp->conn,fsp->fsp_name,false,&bsize,&dfree,&dsize);
+                /* space_avail is 1k blocks */
+                if (space_avail == (SMB_BIG_UINT)-1 ||
+                                ((SMB_BIG_UINT)space_to_write/1024 > space_avail) ) {
+                        errno = ENOSPC;
+                        return -1;
+                }
+        }
+
         /* Write out the real space on disk. */
         if (SMB_VFS_LSEEK(fsp, st.st_size, SEEK_SET) != st.st_size)

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

@@ -189 +189 @@
         }
 
-        data->device_mapping_fn = fileid_device_mapping_fsid;
+        /*
+         * "fileid:mapping" is only here as fallback for old setups
+         * "fileid:algorithm" is the option new setups should use
+         */
+        algorithm = lp_parm_const_string(SNUM(handle->conn),
+                                         "fileid", "mapping",
+                                         "fsname");
         algorithm = lp_parm_const_string(SNUM(handle->conn),
                                          "fileid", "algorithm",
-                                         "fsname");
+                                         algorithm);
         if (strcmp("fsname", algorithm) == 0) {
                 data->device_mapping_fn = fileid_device_mapping_fsname;

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

@@ -702 +702 @@
 {
         char *prefix = NULL;
+        char *result;
 
         prefix = talloc_strdup(ctx,
@@ -709 +710 @@
                 return NULL;
         }
-        return talloc_sub_advanced(ctx,
+        result = talloc_sub_advanced(ctx,
                         lp_servicename(SNUM(conn)), conn->user,
                         conn->connectpath, conn->gid,
@@ -715 +716 @@
                         current_user_info.domain,
                         prefix);
+        TALLOC_FREE(prefix);
+        return result;
 }
 

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

@@ -526 +526 @@
         char *ostream_fname = NULL;
         char *nstream_fname = NULL;
+        char *newname_full = NULL;
 
         DEBUG(10, ("streams_depot_rename called for %s => %s\n",
@@ -537 +538 @@
         }
 
-        if (!(old_is_stream && new_is_stream)) {
-                errno = ENOSYS;
-                return -1;
-        }
-
         frame = talloc_stackframe();
 
@@ -550 +546 @@
         }
 
-        if (!NT_STATUS_IS_OK(split_ntfs_stream_name(talloc_tos(), oldname,
+        if (!NT_STATUS_IS_OK(split_ntfs_stream_name(talloc_tos(), newname,
                                                     &nbase, &nsname))) {
                 errno = ENOMEM;
@@ -562 +558 @@
         }
 
-        if (StrCaseCmp(obase, nbase) != 0) {
-                errno = ENOSYS;
-                goto done;
-        }
-
         ostream_fname = stream_name(handle, oldname, false);
         if (ostream_fname == NULL) {
@@ -572 +563 @@
         }
 
-        nstream_fname = stream_name(handle, newname, false);
+        /*
+         * Handle passing in a stream name without the base file.  This is
+         * exercised by the NTRENAME streams rename path.
+         */
+        if (StrCaseCmp(nbase, "./") == 0) {
+                newname_full = talloc_asprintf(talloc_tos(), "%s:%s", obase,
+                                               nsname);
+                if (newname_full == NULL) {
+                        errno = ENOMEM;
+                        goto done;
+                }
+        }
+
+        nstream_fname = stream_name(handle,
+                                    newname_full ? newname_full : newname,
+                                    false);
         if (nstream_fname == NULL) {
                 return -1;

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

@@ -512 +512 @@
         }
 
-        if (!(o_is_stream && n_is_stream)) {
-                errno = ENOSYS;
-                goto fail;
-        }
-
         frame = talloc_stackframe();
         if (!frame) {
@@ -541 +536 @@
 
         if (nstream == NULL) {
-                errno = ENOSYS;
-                goto fail;
-        }
-
-        /* the new base should be empty */
-        if (StrCaseCmp(obase, nbase) != 0) {
                 errno = ENOSYS;
                 goto fail;