Changeset 751 for trunk/server/source3/smbd/vfs.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/smbd/vfs.c (modified) (4 diffs)

trunk/server/source3/smbd/vfs.c

@@ -1134 +1134 @@
 }
 
+/**
+ * Initialize num_streams and streams, then call VFS op streaminfo
+ */
+NTSTATUS vfs_streaminfo(connection_struct *conn,
+                        struct files_struct *fsp,
+                        const char *fname,
+                        TALLOC_CTX *mem_ctx,
+                        unsigned int *num_streams,
+                        struct stream_struct **streams)
+{
+        *num_streams = 0;
+        *streams = NULL;
+        return SMB_VFS_STREAMINFO(conn, fsp, fname, mem_ctx, num_streams, streams);
+}
+
 /*
   generate a file_id from a stat structure
@@ -1509 +1524 @@
 
                 /* cd into the parent dir to pin it. */
-                ret = SMB_VFS_CHDIR(fsp->conn, parent_dir);
+                ret = vfs_ChDir(fsp->conn, parent_dir);
                 if (ret == -1) {
                         return map_nt_error_from_unix(errno);
@@ -1520 +1535 @@
                 ret = SMB_VFS_LSTAT(fsp->conn, &local_fname);
                 if (ret == -1) {
-                        return map_nt_error_from_unix(errno);
+                        status = map_nt_error_from_unix(errno);
+                        goto out;
                 }
 
                 /* Ensure it matches the fsp stat. */
                 if (!check_same_stat(&local_fname.st, &fsp->fsp_name->st)) {
-                        return NT_STATUS_ACCESS_DENIED;
+                        status = NT_STATUS_ACCESS_DENIED;
+                        goto out;
                 }
                 path = final_component;
@@ -1548 +1565 @@
         }
 
+  out:
+
         if (as_root) {
                 vfs_ChDir(fsp->conn,saved_dir);