librpc/idr Use the Samba3 notify.idl in common.

The extra fields in the structure that Samba4 does not use should not
bother it.

Andrew Bartlett

Signed-off-by: Andrew Tridgell <tridge@samba.org>

5 files changed, 2 insertions, 92 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 311678d6bb..8165d2585c 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1604,7 +1604,6 @@ modules:: SHOWFLAGS $(MODULES)
 
 IDL_FILES = librpc/idl/messaging.idl \
 	    librpc/idl/libnetapi.idl \
-	    librpc/idl/notify.idl \
 	    librpc/idl/wbint.idl \
 	    librpc/idl/perfcount.idl \
 	    librpc/idl/secrets.idl \
diff --git a/source3/librpc/idl/notify.idl b/source3/librpc/idl/notify.idl
deleted file mode 100644
index 0776ed107c..0000000000
--- a/source3/librpc/idl/notify.idl
+++ /dev/null
@@ -1,84 +0,0 @@
-#include "idl_types.h"
-
-import "file_id.idl", "server_id.idl";
-
-/*
-   IDL structures for notify change code
-
-   this defines the structures used in the notify database code, and
-   the change notify buffers
-*/
-
-[
-  pointer_default(unique)
-]
-interface notify
-{
-
-	/* structure used in the notify database */
-	typedef [public] struct {
-		server_id server;
-		uint32 filter; /* filter to apply in this directory */
-		uint32 subdir_filter; /* filter to apply in child directories */
-		uint32 dir_fd;   /* fd of open directory */
-		file_id dir_id;  /* file_id of open directory */
-		utf8string path;
-		uint32 path_len; /* saves some computation on search */
-		pointer private_data;
-	} notify_entry;
-
-	typedef [public] struct {
-		uint32 num_entries;
-		notify_entry entries[num_entries];
-	} notify_entry_array;
-
-	/*
-	  to allow for efficient search for matching entries, we
-	  divide them by the directory depth, with a separate array
-	  per depth. The entries within each depth are sorted by path,
-	  allowing for a bisection search.
-
-	  The max_mask and max_mask_subdir at each depth is the
-	  bitwise or of the filters and subdir filters for all entries
-	  at that depth. This allows a depth to be quickly skipped if
-	  no entries will match the target filter	  
-	*/
-	typedef struct {
-		uint32 max_mask;
-		uint32 max_mask_subdir;
-		uint32 num_entries;
-		notify_entry entries[num_entries];
-	} notify_depth;
-
-	typedef [public] struct {
-		uint32 num_depths;
-		notify_depth depth[num_depths];
-	} notify_array;
-
-	/* structure sent between servers in notify messages */
-	typedef [public] struct {
-		uint32 action;
-		utf8string path;
-		pointer private_data;
-	} notify_event;
-
-	typedef [v1_enum] enum {
-		FILE_ACTION_ADDED		= 0x00000001,
-		FILE_ACTION_REMOVED		= 0x00000002,
-		FILE_ACTION_MODIFIED		= 0x00000003,
-		FILE_ACTION_RENAMED_OLD_NAME	= 0x00000004,
-		FILE_ACTION_RENAMED_NEW_NAME	= 0x00000005,
-		FILE_ACTION_ADDED_STREAM	= 0x00000006,
-		FILE_ACTION_REMOVED_STREAM	= 0x00000007,
-		FILE_ACTION_MODIFIED_STREAM	= 0x00000008
-	} FILE_NOTIFY_ACTION;
-
-	/* structure sent at the CIFS layer */
-	/* Align on 4-byte boundary according to MS-CIFS 2.2.7.4.2 */
-	typedef [public,gensize,flag(NDR_ALIGN4)] struct {
-		uint32 NextEntryOffset;
-		FILE_NOTIFY_ACTION Action;
-		[value(strlen_m(FileName1)*2)] uint32 FileNameLength;
-		[charset(UTF16),flag(STR_NOTERM)] uint16 FileName1[FileNameLength];
-	} FILE_NOTIFY_INFORMATION;
-}
diff --git a/source3/librpc/idl/wscript_build b/source3/librpc/idl/wscript_build
index 97b14659d1..3e07542320 100644
--- a/source3/librpc/idl/wscript_build
+++ b/source3/librpc/idl/wscript_build
@@ -5,7 +5,7 @@ import os
 topinclude=os.path.join(bld.srcnode.abspath(), 'librpc/idl')
 
 bld.SAMBA_PIDL_LIST('PIDL',
-                    '''messaging.idl libnetapi.idl notify.idl
+                    '''messaging.idl libnetapi.idl
                        perfcount.idl secrets.idl libnet_join.idl''',
                     options='--includedir=%s --header --ndr-parser' % topinclude,
                     output_dir='../gen_ndr')
diff --git a/source3/librpc/wscript_build b/source3/librpc/wscript_build
index 7f18f03258..a4af551e7f 100644
--- a/source3/librpc/wscript_build
+++ b/source3/librpc/wscript_build
@@ -15,11 +15,6 @@ bld.SAMBA3_SUBSYSTEM('NDR_MESSAGING',
 	public_deps='ndr NDR_SERVER_ID'
 	)
 
-bld.SAMBA3_SUBSYSTEM('NDR_NOTIFY3',
-	source='gen_ndr/ndr_notify.c',
-	public_deps='ndr NDR_FILE_ID NDR_SERVER_ID'
-	)
-
 bld.SAMBA3_SUBSYSTEM('NDR_SECRETS',
 	source='gen_ndr/ndr_secrets.c',
 	public_deps='ndr'
diff --git a/source3/wscript_build b/source3/wscript_build
index b30c204ab3..f09b8707f1 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -888,7 +888,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
                     PARAM_WITHOUT_REG samba3core LIBSMB POPT_SAMBA3 KRBCLIENT AVAHI
                     LIBMSRPC_GEN msrpc3 ads LIBADS_SERVER LIBADS_PRINTER
                     vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE
-                    PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY3 REGFIO
+                    PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY REGFIO
                     smbconf REG_FULL FNAME_UTIL
                     LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
                     RPC_NDR_SRVSVC npa_tstream INIT_NETLOGON INIT_SAMR