Changeset 860 for vendor/current/source3/smbd/nttrans.c

Timestamp:

May 12, 2014, 8:58:38 PM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: updated vendor to latest version

File:

• vendor/current/source3/smbd/nttrans.c (modified) (4 diffs)

vendor/current/source3/smbd/nttrans.c

@@ -537 +537 @@
                                 req->flags2 & FLAGS2_DFS_PATHNAMES,
                                 fname,
-                                0,
+                                (create_disposition == FILE_CREATE)
+                                        ? UCF_CREATING_FILE : 0,
                                 NULL,
                                 &smb_fname);
@@ -886 +887 @@
         /* Ensure we have at least one thing set. */
         if ((security_info_sent & (SECINFO_OWNER|SECINFO_GROUP|SECINFO_DACL|SECINFO_SACL)) == 0) {
-                if (security_info_sent & SECINFO_LABEL) {
-                        /* Only consider SECINFO_LABEL if no other
-                           bits are set. Just like W2K3 we don't
-                           store this. */
-                        return NT_STATUS_OK;
-                }
-                return NT_STATUS_INVALID_PARAMETER;
+                /* Just like W2K3 */
+                return NT_STATUS_OK;
         }
 
@@ -990 +986 @@
                         break;
                 }
+
+                /* Integer wrap protection for the increment. */
+                if (offset + next_offset < offset) {
+                        break;
+                }
+
                 offset += next_offset;
+
+                /* Integer wrap protection for while loop. */
+                if (offset + 4 < offset) {
+                        break;
+                }
+
         }
 
@@ -1159 +1167 @@
                                 req->flags2 & FLAGS2_DFS_PATHNAMES,
                                 fname,
-                                0,
+                                (create_disposition == FILE_CREATE)
+                                        ? UCF_CREATING_FILE : 0,
                                 NULL,
                                 &smb_fname);