From 081f8883bafc11ca7c08f868ec19f1ea32071837 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 17 Dec 2008 00:06:34 +0100
Subject: s4: fix LIBEVENTS dependencies and use more forward declarations

We should only include events.h where we really need it
and prefer forward declarations of 'struct event_context'

metze
---
 source4/ntvfs/posix/config.mk    | 2 +-
 source4/ntvfs/sysdep/config.mk   | 2 ++
 source4/ntvfs/sysdep/sys_lease.c | 1 -
 source4/ntvfs/sysdep/sys_lease.h | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'source4/ntvfs')

diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk
index 1ea4e8f97d..b38efba79b 100644
--- a/source4/ntvfs/posix/config.mk
+++ b/source4/ntvfs/posix/config.mk
@@ -29,7 +29,7 @@ pvfs_acl_nfs4_OBJ_FILES = $(ntvfssrcdir)/posix/pvfs_acl_nfs4.o
 
 ################################################
 [SUBSYSTEM::pvfs_aio]
-PRIVATE_DEPENDENCIES = LIBAIO_LINUX
+PRIVATE_DEPENDENCIES = LIBEVENTS LIBAIO_LINUX
 ################################################
 
 pvfs_aio_OBJ_FILES = $(ntvfssrcdir)/posix/pvfs_aio.o
diff --git a/source4/ntvfs/sysdep/config.mk b/source4/ntvfs/sysdep/config.mk
index 1122d5c39d..49ad70b95e 100644
--- a/source4/ntvfs/sysdep/config.mk
+++ b/source4/ntvfs/sysdep/config.mk
@@ -3,6 +3,7 @@
 [MODULE::sys_notify_inotify]
 SUBSYSTEM = sys_notify
 INIT_FUNCTION = sys_notify_inotify_init
+PRIVATE_DEPENDENCIES = LIBEVENTS
 # End MODULE sys_notify_inotify
 ################################################
 
@@ -17,6 +18,7 @@ sys_notify_inotify_OBJ_FILES = $(ntvfssrcdir)/sysdep/inotify.o
 sys_notify_OBJ_FILES = $(ntvfssrcdir)/sysdep/sys_notify.o
 
 [SUBSYSTEM::sys_lease_linux]
+PRIVATE_DEPENDENCIES = LIBEVENTS
 
 sys_lease_linux_OBJ_FILES = $(ntvfssrcdir)/sysdep/sys_lease_linux.o
 
diff --git a/source4/ntvfs/sysdep/sys_lease.c b/source4/ntvfs/sysdep/sys_lease.c
index 6e28b46550..64e993f395 100644
--- a/source4/ntvfs/sysdep/sys_lease.c
+++ b/source4/ntvfs/sysdep/sys_lease.c
@@ -25,7 +25,6 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "ntvfs/sysdep/sys_lease.h"
-#include "lib/events/events.h"
 #include "../lib/util/dlinklist.h"
 #include "param/param.h"
 
diff --git a/source4/ntvfs/sysdep/sys_lease.h b/source4/ntvfs/sysdep/sys_lease.h
index e53760fb1e..6cda6398b2 100644
--- a/source4/ntvfs/sysdep/sys_lease.h
+++ b/source4/ntvfs/sysdep/sys_lease.h
@@ -22,6 +22,7 @@
 struct sys_lease_context;
 struct opendb_entry;
 struct messaging_context;
+struct event_context;
 
 typedef NTSTATUS (*sys_lease_send_break_fn)(struct messaging_context *,
 					    struct opendb_entry *,
-- 
cgit 


From 71b3582fe43c42c5e8f902957fd3e8d264bbbe5b Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 18 Dec 2008 01:00:47 +0100
Subject: s4:ntvfs_generic: pass RAW-OPEN again

This is the samba4 version of commit
9391dad85d08bb0939f4db1472c6cf063ebea892

metze
---
 source4/ntvfs/ntvfs_generic.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/ntvfs')

diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c
index 554d5c5aef..b03d57166b 100644
--- a/source4/ntvfs/ntvfs_generic.c
+++ b/source4/ntvfs/ntvfs_generic.c
@@ -281,6 +281,8 @@ static NTSTATUS map_openx_open(uint16_t flags, uint16_t open_mode,
 			       uint16_t open_func, const char *fname,
 			       union smb_open *io2)
 {
+	io2->generic.in.create_options = NTCREATEX_OPTIONS_NON_DIRECTORY_FILE;
+
 	if (flags & OPENX_FLAGS_REQUEST_OPLOCK) {
 		io2->generic.in.flags |= NTCREATEX_FLAGS_REQUEST_OPLOCK;
 	}
-- 
cgit 


From d031472227b44d040698e6dff52dc79028fde854 Mon Sep 17 00:00:00 2001
From: Tim Prouty <tprouty@samba.org>
Date: Thu, 18 Dec 2008 15:01:07 -0800
Subject: s4: Fix include path to work with tevent

---
 source4/ntvfs/sysdep/sys_notify.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/ntvfs')

diff --git a/source4/ntvfs/sysdep/sys_notify.c b/source4/ntvfs/sysdep/sys_notify.c
index a27386bb13..117d16d20a 100644
--- a/source4/ntvfs/sysdep/sys_notify.c
+++ b/source4/ntvfs/sysdep/sys_notify.c
@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "ntvfs/sysdep/sys_notify.h"
-#include "lib/events/events.h"
+#include "../lib/tevent/tevent.h"
 #include "../lib/util/dlinklist.h"
 #include "param/param.h"
 
-- 
cgit