Changeset 745 for trunk/server/source4/ntvfs/ntvfs_generic.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/ntvfs/ntvfs_generic.c (modified) (11 diffs)

trunk/server/source4/ntvfs/ntvfs_generic.c

@@ -149 +149 @@
         uint32_t set_size = 0;
         union smb_setfileinfo *sf;
-        uint_t state;
+        unsigned int state;
 
         if (!NT_STATUS_IS_OK(status)) {
@@ -285 +285 @@
 {
         io2->generic.in.create_options = NTCREATEX_OPTIONS_NON_DIRECTORY_FILE;
+        io2->generic.in.private_flags = 0;
 
         if (flags & OPENX_FLAGS_REQUEST_OPLOCK) {
@@ -328 +329 @@
         case OPENX_MODE_DENY_DOS:
                 /* DENY_DOS is quite strange - it depends on the filename! */
-                io2->generic.in.create_options |= 
+                io2->generic.in.private_flags |=
                         NTCREATEX_OPTIONS_PRIVATE_DENY_DOS;
                 if (is_exe_filename(fname)) {
@@ -343 +344 @@
                 break;
         case OPENX_MODE_DENY_FCB:
-                io2->generic.in.create_options |= NTCREATEX_OPTIONS_PRIVATE_DENY_FCB;
+                io2->generic.in.private_flags |= NTCREATEX_OPTIONS_PRIVATE_DENY_FCB;
                 io2->generic.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
                 break;
@@ -516 +517 @@
                         break;
                 }
-                io2->generic.in.root_fid        = 0;
+                io2->generic.in.root_fid.fnum   = 0;
                 io2->generic.in.access_mask     = io->smb2.in.desired_access;
                 io2->generic.in.alloc_size      = io->smb2.in.alloc_size;
@@ -529 +530 @@
                 io2->generic.in.ea_list         = &io->smb2.in.eas;
                 io2->generic.in.query_maximal_access = io->smb2.in.query_maximal_access; 
+                io2->generic.in.private_flags   = 0;
 
                 /* we don't support timewarp yet */
@@ -580 +582 @@
         case RAW_QFS_DSKATTR: {
                 /* map from generic to DSKATTR */
-                uint_t bpunit = 64;
+                unsigned int bpunit = 64;
 
                 /* we need to scale the sizes to fit */
@@ -1107 +1109 @@
                    MS-SMB2 3.3.5.14 */
                 if (lck->smb2.in.locks[0].flags & SMB2_LOCK_FLAG_UNLOCK) {
+                        if (lck->smb2.in.locks[0].flags & SMB2_LOCK_FLAG_FAIL_IMMEDIATELY) {
+                                return NT_STATUS_INVALID_PARAMETER;
+                        }
                         lck2->generic.in.ulock_cnt = lck->smb2.in.lock_count;
                         isunlock = true;
@@ -1114 +1119 @@
                 }
                 for (i=0;i<lck->smb2.in.lock_count;i++) {
+                        if (!isunlock &&
+                            lck->smb2.in.locks[i].flags == SMB2_LOCK_FLAG_NONE) {
+                                return NT_STATUS_INVALID_PARAMETER;
+                        }
+
+                        if (lck->smb2.in.locks[i].flags & ~SMB2_LOCK_FLAG_ALL_MASK) {
+                                return NT_STATUS_INVALID_PARAMETER;
+                        }
+
                         if (isunlock && 
                             (lck->smb2.in.locks[i].flags & 
@@ -1176 +1190 @@
         union smb_lock *lck;
         union smb_close *cl;
-        uint_t state;
+        unsigned int state;
 
         if (NT_STATUS_IS_ERR(status)) {
@@ -1370 +1384 @@
         union smb_lock *lck;
         NTSTATUS status;
-        uint_t state;
+        unsigned int state;
 
         rd2 = talloc(req, union smb_read);