From 0f04beff337a936a66c86272ff79defd9e8ae173 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 16 Dec 2008 15:36:18 +0100 Subject: Rename dom_sid.idl -> server_id.idl (since it no longer actually contains the dom_sid). No longer include it from security.idl. --- source3/librpc/gen_ndr/dom_sid.h | 15 ---------- source3/librpc/gen_ndr/ndr_dom_sid.h | 10 ------- source3/librpc/gen_ndr/ndr_security.c | 1 - source3/librpc/gen_ndr/ndr_security.h | 1 - source3/librpc/gen_ndr/security.h | 1 - source3/librpc/idl/dom_sid.idl | 29 ------------------ source3/librpc/idl/notify.idl | 56 +++++++++++++++++++++++++++++++++++ 7 files changed, 56 insertions(+), 57 deletions(-) delete mode 100644 source3/librpc/gen_ndr/dom_sid.h delete mode 100644 source3/librpc/gen_ndr/ndr_dom_sid.h delete mode 100644 source3/librpc/idl/dom_sid.idl create mode 100644 source3/librpc/idl/notify.idl (limited to 'source3/librpc') diff --git a/source3/librpc/gen_ndr/dom_sid.h b/source3/librpc/gen_ndr/dom_sid.h deleted file mode 100644 index 57dd16855a..0000000000 --- a/source3/librpc/gen_ndr/dom_sid.h +++ /dev/null @@ -1,15 +0,0 @@ -/* header auto-generated by pidl */ - -#include - -#define dom_sid2 dom_sid -#define dom_sid28 dom_sid -#define dom_sid0 dom_sid -#ifndef _HEADER_dom_sid -#define _HEADER_dom_sid - -struct _dummy_domsid { - uint8_t dummy; -}; - -#endif /* _HEADER_dom_sid */ diff --git a/source3/librpc/gen_ndr/ndr_dom_sid.h b/source3/librpc/gen_ndr/ndr_dom_sid.h deleted file mode 100644 index 145ec1db46..0000000000 --- a/source3/librpc/gen_ndr/ndr_dom_sid.h +++ /dev/null @@ -1,10 +0,0 @@ -/* header auto-generated by pidl */ - -#include "librpc/ndr/libndr.h" -#include "librpc/gen_ndr/dom_sid.h" - -#ifndef _HEADER_NDR_dom_sid -#define _HEADER_NDR_dom_sid - -#define NDR_DOM_SID_CALL_COUNT (0) -#endif /* _HEADER_NDR_dom_sid */ diff --git a/source3/librpc/gen_ndr/ndr_security.c b/source3/librpc/gen_ndr/ndr_security.c index 8339a40d40..b4d221ac90 100644 --- a/source3/librpc/gen_ndr/ndr_security.c +++ b/source3/librpc/gen_ndr/ndr_security.c @@ -4,7 +4,6 @@ #include "librpc/gen_ndr/ndr_security.h" #include "librpc/gen_ndr/ndr_misc.h" -#include "librpc/gen_ndr/ndr_dom_sid.h" _PUBLIC_ enum ndr_err_code ndr_push_security_ace_flags(struct ndr_push *ndr, int ndr_flags, uint8_t r) { NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r)); diff --git a/source3/librpc/gen_ndr/ndr_security.h b/source3/librpc/gen_ndr/ndr_security.h index f8cbf4afa8..41c66aa65b 100644 --- a/source3/librpc/gen_ndr/ndr_security.h +++ b/source3/librpc/gen_ndr/ndr_security.h @@ -6,7 +6,6 @@ #ifndef _HEADER_NDR_security #define _HEADER_NDR_security -#include "librpc/gen_ndr/ndr_dom_sid.h" #define NDR_SECURITY_CALL_COUNT (0) enum ndr_err_code ndr_push_dom_sid(struct ndr_push *ndr, int ndr_flags, const struct dom_sid *r); enum ndr_err_code ndr_pull_dom_sid(struct ndr_pull *ndr, int ndr_flags, struct dom_sid *r); diff --git a/source3/librpc/gen_ndr/security.h b/source3/librpc/gen_ndr/security.h index 99e1f4b1c9..2b422608ea 100644 --- a/source3/librpc/gen_ndr/security.h +++ b/source3/librpc/gen_ndr/security.h @@ -3,7 +3,6 @@ #include #include "librpc/gen_ndr/misc.h" -#include "librpc/gen_ndr/dom_sid.h" #define dom_sid2 dom_sid #define dom_sid28 dom_sid #define dom_sid0 dom_sid diff --git a/source3/librpc/idl/dom_sid.idl b/source3/librpc/idl/dom_sid.idl deleted file mode 100644 index c405c18726..0000000000 --- a/source3/librpc/idl/dom_sid.idl +++ /dev/null @@ -1,29 +0,0 @@ -/* - use the same structure for dom_sid2 as dom_sid. A dom_sid2 is really - just a dom sid, but with the sub_auths represented as a conformant - array. As with all in-structure conformant arrays, the array length - is placed before the start of the structure. That's what gives rise - to the extra num_auths elemenent. We don't want the Samba code to - have to bother with such esoteric NDR details, so its easier to just - define it as a dom_sid and use pidl magic to make it all work. It - just means you need to mark a sid as a "dom_sid2" in the IDL when you - know it is of the conformant array variety -*/ -cpp_quote("#define dom_sid2 dom_sid") - -/* same struct as dom_sid but inside a 28 bytes fixed buffer in NDR */ -cpp_quote("#define dom_sid28 dom_sid") - -/* same struct as dom_sid but in a variable byte buffer, which is maybe empty in NDR */ -cpp_quote("#define dom_sid0 dom_sid") - -[ - pointer_default(unique) -] -interface dom_sid -{ - struct _dummy_domsid { - uint8 dummy; - }; -} - diff --git a/source3/librpc/idl/notify.idl b/source3/librpc/idl/notify.idl new file mode 100644 index 0000000000..c4e633c254 --- /dev/null +++ b/source3/librpc/idl/notify.idl @@ -0,0 +1,56 @@ +#include "idl_types.h" + +/* + 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 */ + utf8string path; + uint32 path_len; /* saves some computation on search */ + pointer private_data; + } notify_entry; + + /* + 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; + +} -- cgit