[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-794-gdf82b0a

Andrew Tridgell tridge at samba.org
Wed Feb 13 06:36:53 GMT 2008


The branch, v4-0-test has been updated
       via  df82b0aa6990b59cde20893cb690a8a260526178 (commit)
      from  17357072dd175b7548122e40e4cecc6087e52561 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit df82b0aa6990b59cde20893cb690a8a260526178
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Feb 13 17:36:41 2008 +1100

    missed another spot in the SMB2 create conversion

-----------------------------------------------------------------------

Summary of changes:
 source/ntvfs/ntvfs_generic.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/ntvfs/ntvfs_generic.c b/source/ntvfs/ntvfs_generic.c
index 7708f4f..5092e73 100644
--- a/source/ntvfs/ntvfs_generic.c
+++ b/source/ntvfs/ntvfs_generic.c
@@ -208,7 +208,7 @@ static NTSTATUS ntvfs_map_open_finish(struct ntvfs_module_context *ntvfs,
 
 	case RAW_OPEN_SMB2:
 		io->smb2.out.file.ntvfs		= io2->generic.out.file.ntvfs;
-		io->smb2.out.oplock_flags	= 0;
+		io->smb2.out.oplock_level	= 0;
 		io->smb2.out.create_action	= io2->generic.out.create_action;
 		io->smb2.out.create_time	= io2->generic.out.create_time;
 		io->smb2.out.access_time	= io2->generic.out.access_time;
@@ -217,7 +217,7 @@ static NTSTATUS ntvfs_map_open_finish(struct ntvfs_module_context *ntvfs,
 		io->smb2.out.alloc_size		= io2->generic.out.alloc_size;
 		io->smb2.out.size		= io2->generic.out.size;
 		io->smb2.out.file_attr		= io2->generic.out.attrib;
-		io->smb2.out._pad		= 0;
+		io->smb2.out.reserved2		= 0;
 		io->smb2.out.blob		= data_blob(NULL, 0);
 		break;
 
@@ -486,13 +486,13 @@ _PUBLIC_ NTSTATUS ntvfs_map_open(struct ntvfs_module_context *ntvfs,
 	case RAW_OPEN_SMB2:
 		io2->generic.in.flags		= 0;
 		io2->generic.in.root_fid	= 0;
-		io2->generic.in.access_mask	= io->smb2.in.access_mask;
+		io2->generic.in.access_mask	= io->smb2.in.desired_access;
 		io2->generic.in.alloc_size	= 0;
-		io2->generic.in.file_attr	= io->smb2.in.file_attr;
+		io2->generic.in.file_attr	= io->smb2.in.file_attributes;
 		io2->generic.in.share_access	= io->smb2.in.share_access;
-		io2->generic.in.open_disposition= io->smb2.in.open_disposition;
+		io2->generic.in.open_disposition= io->smb2.in.create_disposition;
 		io2->generic.in.create_options	= io->smb2.in.create_options;
-		io2->generic.in.impersonation	= io->smb2.in.impersonation;
+		io2->generic.in.impersonation	= io->smb2.in.impersonation_level;
 		io2->generic.in.security_flags	= 0;
 		io2->generic.in.fname		= io->smb2.in.fname;
 		io2->generic.in.sec_desc	= NULL;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list