summaryrefslogtreecommitdiff
path: root/source3/librpc
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-05-02 11:10:12 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-06-09 12:40:08 +0200
commita772797a384a1142c5af95bd06c14a141dea38d7 (patch)
tree27bf739b31771090ce4fc5f814525bfadeec845f /source3/librpc
parentd057116cc2e454ba097d0dcb22e16108a05a4a1b (diff)
downloadsamba-a772797a384a1142c5af95bd06c14a141dea38d7.tar.gz
samba-a772797a384a1142c5af95bd06c14a141dea38d7.tar.bz2
samba-a772797a384a1142c5af95bd06c14a141dea38d7.zip
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>
Diffstat (limited to 'source3/librpc')
-rw-r--r--source3/librpc/idl/notify.idl84
-rw-r--r--source3/librpc/idl/wscript_build2
-rw-r--r--source3/librpc/wscript_build5
3 files changed, 1 insertions, 90 deletions
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'