The branch, master has been updated via 456f821 s3: Fix indentation of if-expressions from 1c1ae6d docs: Change TOSHARG-VFS to avoid suggesting VFS modules are Linux/IRIX only
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 456f821626b50e20acc943c7586f1e1cff40f25f Author: Volker Lendecke <v...@samba.org> Date: Tue Sep 4 09:16:55 2012 +0200 s3: Fix indentation of if-expressions To me this makes open_file_ntcreate a little easier to understand Autobuild-User(master): Volker Lendecke <v...@samba.org> Autobuild-Date(master): Tue Sep 25 10:08:15 CEST 2012 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: source3/smbd/open.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 7312707..d142d96 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -2122,12 +2122,13 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, */ if ((access_mask & (FILE_WRITE_DATA | FILE_APPEND_DATA)) || - (oplock_request & FORCE_OPLOCK_BREAK_TO_NONE)) { + (oplock_request & FORCE_OPLOCK_BREAK_TO_NONE)) { /* DENY_DOS opens are always underlying read-write on the file handle, no matter what the requested access mask says. */ if ((private_flags & NTCREATEX_OPTIONS_PRIVATE_DENY_DOS) || - access_mask & (FILE_READ_ATTRIBUTES|FILE_READ_DATA|FILE_READ_EA|FILE_EXECUTE)) { + access_mask & (FILE_READ_ATTRIBUTES|FILE_READ_DATA| + FILE_READ_EA|FILE_EXECUTE)) { flags = O_RDWR; } else { flags = O_WRONLY; -- Samba Shared Repository