Changeset 751 for trunk/server/source3/modules/vfs_default.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/modules/vfs_default.c (modified) (3 diffs)

trunk/server/source3/modules/vfs_default.c

@@ -1045 +1045 @@
 
 #ifdef HAVE_KERNEL_OPLOCKS_LINUX
-        /* first set the signal handler */
-        if(linux_set_lease_sighandler(fsp->fh->fd) == -1) {
-                return -1;
-        }
-
         result = linux_setlease(fsp->fh->fd, leasetype);
 #else
@@ -1183 +1178 @@
 {
         SMB_STRUCT_STAT sbuf;
-        unsigned int num_streams = 0;
-        struct stream_struct *streams = NULL;
+        struct stream_struct *tmp_streams = NULL;
         int ret;
 
@@ -1219 +1213 @@
         }
 
-        streams = talloc(mem_ctx, struct stream_struct);
-
-        if (streams == NULL) {
+        tmp_streams = talloc_realloc(mem_ctx, *pstreams, struct stream_struct,
+                                        (*pnum_streams) + 1);
+        if (tmp_streams == NULL) {
                 return NT_STATUS_NO_MEMORY;
         }
-
-        streams->size = sbuf.st_ex_size;
-        streams->alloc_size = SMB_VFS_GET_ALLOC_SIZE(handle->conn, fsp, &sbuf);
-
-        streams->name = talloc_strdup(streams, "::$DATA");
-        if (streams->name == NULL) {
-                TALLOC_FREE(streams);
+        tmp_streams[*pnum_streams].name = talloc_strdup(tmp_streams, "::$DATA");
+        if (tmp_streams[*pnum_streams].name == NULL) {
                 return NT_STATUS_NO_MEMORY;
         }
-
-        num_streams = 1;
+        tmp_streams[*pnum_streams].size = sbuf.st_ex_size;
+        tmp_streams[*pnum_streams].alloc_size = SMB_VFS_GET_ALLOC_SIZE(handle->conn, fsp, &sbuf);
+
+        *pnum_streams += 1;
+        *pstreams = tmp_streams;
  done:
-        *pnum_streams = num_streams;
-        *pstreams = streams;
         return NT_STATUS_OK;
 }