Changeset 732 for branches/samba-3.5.x/source3/modules

Timestamp:

Nov 12, 2012, 4:35:55 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.12

File:

• branches/samba-3.5.x/source3/modules/vfs_acl_common.c (modified) (5 diffs)

branches/samba-3.5.x/source3/modules/vfs_acl_common.c

@@ -248 +248 @@
                                 struct security_descriptor **ppdesc)
 {
-        DATA_BLOB blob;
+        DATA_BLOB blob = data_blob_null;
         NTSTATUS status;
         uint16_t hash_type;
@@ -826 +826 @@
         struct smb_filename local_fname;
         int saved_errno = 0;
+        char *saved_dir = NULL;
+
+        saved_dir = vfs_GetWd(talloc_tos(),conn);
+        if (!saved_dir) {
+                saved_errno = errno;
+                goto out;
+        }
 
         if (!parent_dirname(talloc_tos(), path,
@@ -838 +845 @@
 
         /* cd into the parent dir to pin it. */
-        ret = SMB_VFS_CHDIR(conn, parent_dir);
+        ret = vfs_ChDir(conn, parent_dir);
         if (ret == -1) {
                 saved_errno = errno;
@@ -856 +863 @@
         /* Ensure we have this file open with DELETE access. */
         id = vfs_file_id_from_sbuf(conn, &local_fname.st);
-        for (fsp = file_find_di_first(id); fsp; file_find_di_next(fsp)) {
+        for (fsp = file_find_di_first(id); fsp; fsp = file_find_di_next(fsp)) {
                 if (fsp->access_mask & DELETE_ACCESS &&
                                 fsp->delete_on_close) {
@@ -891 +898 @@
         TALLOC_FREE(parent_dir);
 
-        vfs_ChDir(conn, conn->connectpath);
+        if (saved_dir) {
+                vfs_ChDir(conn, saved_dir);
+        }
         if (saved_errno) {
                 errno = saved_errno;