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

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.4

File:

• branches/samba-3.2.x/source/modules/vfs_tsmsm.c (modified) (3 diffs)

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;
         }