diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-02-21 09:55:13 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-21 09:55:13 +1100 |
| commit | 774fa12ac1695600710ce9fac18024edd38161ee (patch) | |
| tree | 5440d8c0f00d28656e0d8f65f3b771eb11a01842 /source4/ntvfs/ipc | |
| parent | 49b3a4829325967df9d1e616ad32e5379ce6cf5d (diff) | |
| parent | 910a1cafdf253255510d3aff7cc2385da43331dd (diff) | |
| download | samba-774fa12ac1695600710ce9fac18024edd38161ee.tar.gz samba-774fa12ac1695600710ce9fac18024edd38161ee.tar.bz2 samba-774fa12ac1695600710ce9fac18024edd38161ee.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 5cd3310b78a85243eb436d05db3228c3495f9162)
Diffstat (limited to 'source4/ntvfs/ipc')
| -rw-r--r-- | source4/ntvfs/ipc/vfs_ipc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c index 81cd984f0b..92f0eadae1 100644 --- a/source4/ntvfs/ipc/vfs_ipc.c +++ b/source4/ntvfs/ipc/vfs_ipc.c @@ -322,7 +322,7 @@ static NTSTATUS ipc_open_smb2(struct ntvfs_module_context *ntvfs, NT_STATUS_NOT_OK_RETURN(status); oi->smb2.out.file.ntvfs = p->handle; - oi->smb2.out.oplock_flags = oi->smb2.in.oplock_flags; + oi->smb2.out.oplock_level = oi->smb2.in.oplock_level; oi->smb2.out.create_action = NTCREATEX_ACTION_EXISTED; oi->smb2.out.create_time = 0; oi->smb2.out.access_time = 0; @@ -331,7 +331,7 @@ static NTSTATUS ipc_open_smb2(struct ntvfs_module_context *ntvfs, oi->smb2.out.alloc_size = 4096; oi->smb2.out.size = 0; oi->smb2.out.file_attr = FILE_ATTRIBUTE_NORMAL; - oi->smb2.out._pad = 0; + oi->smb2.out.reserved2 = 0; oi->smb2.out.blob = data_blob(NULL, 0); return status; |