r15404: Check for WRITE_THOUGH before calling lp_ fn. I hate

extra fn calls.
Jeremy.
(This used to be commit e468e1e5c2dbee29066f0efe4141d8705def5d6f)

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 1c8716abdac39b24ec59474ed9f120d735a6e8ea..3d537b2f3943094272a3f877e02feb8c6aa0b339 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1308,7 +1308,7 @@ files_struct *open_file_ntcreate(connection_struct *conn,
         */
 
 #if defined(O_SYNC)
-       if (lp_strict_sync(SNUM(conn)) && (create_options & FILE_WRITE_THROUGH)) {
+       if ((create_options & FILE_WRITE_THROUGH) && lp_strict_sync(SNUM(conn))) {
                flags2 |= O_SYNC;
        }
 #endif /* O_SYNC */