Changeset 862 for trunk/server/source3/smbd/open.c

Timestamp:

May 13, 2014, 11:39:04 AM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/smbd/open.c (modified) (6 diffs)

trunk/server/source3/smbd/open.c

@@ -59 +59 @@
         }
 
+
+
+
+
+
+
+
         return se_access_check(sd,
                                 token,
@@ -143 +150 @@
 
         return status;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -1417 +1466 @@
                         }
 
-                        access_mask = access_granted;
+                        /*
+                         * If we can access the path to this file, by
+                         * default we have FILE_READ_ATTRIBUTES from the
+                         * containing directory. See the section.
+                         * "Algorithm to Check Access to an Existing File"
+                         * in MS-FSA.pdf.
+                         */
+                        access_mask = access_granted | FILE_READ_ATTRIBUTES;
                 } else {
                         access_mask = FILE_GENERIC_ALL;
@@ -1989 +2045 @@
                         /*
                          * If we're returning a share violation, ensure we
-                         * cope with the braindead 1 second delay.
+                         * cope with the braindead 1 second delay.
                          */
 
                         if (!(oplock_request & INTERNAL_OPEN_ONLY) &&
+
                             lp_defer_sharing_violations()) {
                                 struct timeval timeout;
@@ -2753 +2810 @@
         mtimespec = smb_dname->st.st_ex_mtime;
 
-        /* Temporary access mask used to open the directory fd. */
-        fsp->access_mask = FILE_READ_DATA | FILE_READ_ATTRIBUTES;
+        
+
 #ifdef O_DIRECTORY
         status = fd_open(conn, fsp, O_RDONLY|O_DIRECTORY, 0);
@@ -3213 +3270 @@
                         DEBUG(10, ("Unable to stat stream: %s\n",
                                    smb_fname_str_dbg(smb_fname_base)));
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                 }