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

Timestamp:

May 20, 2009, 6:46:53 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.4

Location:

branches/samba-3.2.x/source/modules

Files:

• nfs4_acls.c (modified) (2 diffs)
• vfs_tsmsm.c (modified) (3 diffs)

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

@@ -25 +25 @@
 
 #define SMBACL4_PARAM_TYPE_NAME "nfs4"
+
+extern const struct generic_mapping file_generic_mapping;
 
 #define SMB_ACE4_INT_MAGIC 0x76F8A967
@@ -529 +531 @@
         ace_v4->aceMask = ace_nt->access_mask &
                 (STD_RIGHT_ALL_ACCESS | SA_RIGHT_FILE_ALL_ACCESS);
+
+        se_map_generic(&ace_v4->aceMask, &file_generic_mapping);
 
         if (ace_v4->aceFlags!=ace_nt->flags)

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

@@ -201 +201 @@
         }
 
-        lerrno = 0;
-
         do {
+                lerrno = 0;
+
                 ret = dm_get_dmattr(*dmsession_id, dmhandle, dmhandle_len, 
                                     DM_NO_TOKEN, &dmname, buflen, buf, &rlen);
@@ -280 +280 @@
                               SMB_OFF_T offset, size_t n)
 {
-        bool file_online = tsmsm_aio_force(handle, fsp);
-
-        if(!file_online) 
-            return ENOSYS;
+        bool file_offline = tsmsm_aio_force(handle, fsp);
+
+        if (file_offline) {
+                DEBUG(10,("tsmsm_sendfile on offline file - rejecting\n"));
+                errno = ENOSYS;
+                return -1;
+        }
             
         return SMB_VFS_NEXT_SENDFILE(handle, tofd, fsp, hdr, offset, n);
@@ -334 +337 @@
         if (tsmd->hsmscript == NULL) {
                 /* no script enabled */
-                DEBUG(1, ("tsmsm_set_offline: No tsmsm:hsmscript configured\n"));
+                DEBUG(1, ("tsmsm_set_offline: No 'tsmsm:hsm script' configured\n"));
                 return 0;
         }