Changeset 596 for trunk/server/source3/smbd/dosmode.c

Timestamp:

Jul 2, 2011, 3:35:33 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.8

File:

• trunk/server/source3/smbd/dosmode.c (modified) (4 diffs)

trunk/server/source3/smbd/dosmode.c

@@ -432 +432 @@
                  */
 
-                if (!NT_STATUS_IS_OK(open_file_fchmod(NULL, conn, smb_fname,
+                if (!NT_STATUS_IS_OK(open_file_fchmod(conn, smb_fname,
                                                       &fsp)))
                         return ret;
@@ -442 +442 @@
                 }
                 unbecome_root();
-                close_file_fchmod(NULL, fsp);
+                close_file(NULL, fsp, NORMAL_CLOSE);
                 return ret;
         }
@@ -841 +841 @@
                  * still in our current user context. This ensures we
                  * are not violating security in doing the fchmod.
-                 * This file open does *not* break any oplocks we are
-                 * holding. We need to review this.... may need to
-                 * break batch oplocks open by others. JRA.
                  */
                 files_struct *fsp;
-                if (!NT_STATUS_IS_OK(open_file_fchmod(NULL, conn, smb_fname,
+                if (!NT_STATUS_IS_OK(open_file_fchmod(conn, smb_fname,
                                      &fsp)))
                         return -1;
@@ -852 +849 @@
                 ret = SMB_VFS_FCHMOD(fsp, unixmode);
                 unbecome_root();
-                close_file_fchmod(NULL, fsp);
+                close_file(NULL, fsp, NORMAL_CLOSE);
                 if (!newfile) {
                         notify_fname(conn, NOTIFY_ACTION_MODIFIED,