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. --- source4/cluster/cluster.c | 2 +- source4/cluster/ctdb/ctdb_cluster.c | 2 +- source4/cluster/local.c | 2 +- source4/lib/messaging/irpc.h | 1 + source4/librpc/config.mk | 2 +- source4/librpc/idl/dom_sid.idl | 12 -------- source4/librpc/idl/notify.idl | 58 +++++++++++++++++++++++++++++++++++++ source4/librpc/idl/opendb.idl | 2 +- source4/librpc/idl/server_id.idl | 12 ++++++++ source4/ntvfs/ntvfs.h | 1 + source4/rpc_server/dcerpc_server.h | 2 +- source4/smbd/service_stream.h | 2 +- source4/smbd/service_task.h | 2 +- 13 files changed, 80 insertions(+), 20 deletions(-) delete mode 100644 source4/librpc/idl/dom_sid.idl create mode 100644 source4/librpc/idl/notify.idl create mode 100644 source4/librpc/idl/server_id.idl (limited to 'source4') diff --git a/source4/cluster/cluster.c b/source4/cluster/cluster.c index c09d10900b..b3fc9c2caf 100644 --- a/source4/cluster/cluster.c +++ b/source4/cluster/cluster.c @@ -23,7 +23,7 @@ #include "cluster/cluster.h" #include "cluster/cluster_private.h" #include "librpc/gen_ndr/misc.h" -#include "librpc/gen_ndr/security.h" +#include "librpc/gen_ndr/server_id.h" static struct cluster_ops *ops; diff --git a/source4/cluster/ctdb/ctdb_cluster.c b/source4/cluster/ctdb/ctdb_cluster.c index d0ceef4ad1..1c96319986 100644 --- a/source4/cluster/ctdb/ctdb_cluster.c +++ b/source4/cluster/ctdb/ctdb_cluster.c @@ -29,7 +29,7 @@ #include "tdb_wrap.h" #include "../lib/util/dlinklist.h" #include "param/param.h" -#include "librpc/gen_ndr/security.h" +#include "librpc/gen_ndr/server_id.h" #include "cluster/ctdb/ctdb_cluster.h" /* a linked list of messaging handlers, allowing incoming messages diff --git a/source4/cluster/local.c b/source4/cluster/local.c index 5b872a3e2e..f36a06c9b6 100644 --- a/source4/cluster/local.c +++ b/source4/cluster/local.c @@ -26,7 +26,7 @@ #include "tdb_wrap.h" #include "system/filesys.h" #include "param/param.h" -#include "librpc/gen_ndr/security.h" +#include "librpc/gen_ndr/server_id.h" /* server a server_id for the local node diff --git a/source4/lib/messaging/irpc.h b/source4/lib/messaging/irpc.h index 65e98dce2c..3527f10648 100644 --- a/source4/lib/messaging/irpc.h +++ b/source4/lib/messaging/irpc.h @@ -23,6 +23,7 @@ #define IRPC_H #include "librpc/gen_ndr/irpc.h" +#include "librpc/gen_ndr/server_id.h" /* an incoming irpc message diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index 65c473779f..902312542a 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -54,7 +54,7 @@ PUBLIC_DEPENDENCIES = LIBNDR LIBSECURITY NDR_SECURITY_OBJ_FILES = $(gen_ndrsrcdir)/ndr_security.o \ ../librpc/ndr/ndr_sec_helper.o \ - $(gen_ndrsrcdir)/ndr_dom_sid.o + $(gen_ndrsrcdir)/ndr_server_id.o PUBLIC_HEADERS += $(addprefix $(gen_ndrsrcdir)/, security.h) diff --git a/source4/librpc/idl/dom_sid.idl b/source4/librpc/idl/dom_sid.idl deleted file mode 100644 index 172dda4fae..0000000000 --- a/source4/librpc/idl/dom_sid.idl +++ /dev/null @@ -1,12 +0,0 @@ -[ - pointer_default(unique) -] -interface dom_sid -{ - /* id used to identify a endpoint, possibly in a cluster */ - typedef [public] struct { - hyper id; - uint32 id2; - uint32 node; - } server_id; -} diff --git a/source4/librpc/idl/notify.idl b/source4/librpc/idl/notify.idl new file mode 100644 index 0000000000..a19f737678 --- /dev/null +++ b/source4/librpc/idl/notify.idl @@ -0,0 +1,58 @@ +#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 +*/ + +import "server_id.idl"; + +[ + 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; + +} diff --git a/source4/librpc/idl/opendb.idl b/source4/librpc/idl/opendb.idl index 265cfaf7ad..b76992960a 100644 --- a/source4/librpc/idl/opendb.idl +++ b/source4/librpc/idl/opendb.idl @@ -7,7 +7,7 @@ ntvfs/common/opendb.c */ -import "security.idl"; +import "server_id.idl"; [ pointer_default(unique) diff --git a/source4/librpc/idl/server_id.idl b/source4/librpc/idl/server_id.idl new file mode 100644 index 0000000000..486143546b --- /dev/null +++ b/source4/librpc/idl/server_id.idl @@ -0,0 +1,12 @@ +[ + pointer_default(unique) +] +interface server_id +{ + /* id used to identify a endpoint, possibly in a cluster */ + typedef [public] struct { + hyper id; + uint32 id2; + uint32 node; + } server_id; +} diff --git a/source4/ntvfs/ntvfs.h b/source4/ntvfs/ntvfs.h index fc04d976f4..8433a431b0 100644 --- a/source4/ntvfs/ntvfs.h +++ b/source4/ntvfs/ntvfs.h @@ -24,6 +24,7 @@ #include "libcli/raw/interfaces.h" #include "param/share.h" #include "librpc/gen_ndr/security.h" +#include "librpc/gen_ndr/server_id.h" /* modules can use the following to determine if the interface has changed */ /* version 1 -> 0 - make module stacking easier -- metze */ diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h index bcd3d61f13..28f4308433 100644 --- a/source4/rpc_server/dcerpc_server.h +++ b/source4/rpc_server/dcerpc_server.h @@ -23,7 +23,7 @@ #ifndef SAMBA_DCERPC_SERVER_H #define SAMBA_DCERPC_SERVER_H -#include "librpc/gen_ndr/security.h" +#include "librpc/gen_ndr/server_id.h" #include "librpc/rpc/dcerpc.h" #include "librpc/ndr/libndr.h" diff --git a/source4/smbd/service_stream.h b/source4/smbd/service_stream.h index 7ec2a0538b..805c140a83 100644 --- a/source4/smbd/service_stream.h +++ b/source4/smbd/service_stream.h @@ -23,7 +23,7 @@ #ifndef __SERVICE_STREAM_H__ #define __SERVICE_STREAM_H__ -#include "librpc/gen_ndr/security.h" +#include "librpc/gen_ndr/server_id.h" /* modules can use the following to determine if the interface has changed * please increment the version number after each interface change diff --git a/source4/smbd/service_task.h b/source4/smbd/service_task.h index ddd56bc9c9..c49962f05f 100644 --- a/source4/smbd/service_task.h +++ b/source4/smbd/service_task.h @@ -22,7 +22,7 @@ #ifndef __SERVICE_TASK_H__ #define __SERVICE_TASK_H__ -#include "librpc/gen_ndr/security.h" +#include "librpc/gen_ndr/server_id.h" struct task_server { struct event_context *event_ctx; -- cgit