3 files changed, 10 insertions, 4 deletions
diff --git a/source4/librpc/idl/misc.idl b/source4/librpc/idl/misc.idl
index 9d43a806b7..2b099a6164 100644
--- a/source4/librpc/idl/misc.idl
+++ b/source4/librpc/idl/misc.idl
@@ -44,5 +44,9 @@ interface misc
 		SAMR_REJECT_COMPLEXITY = 5
 	} samr_RejectReason;
 
-
+	/* id used to identify a endpoint, possibly in a cluster */
+	typedef [public] struct {
+		uint32 id;
+		uint32 node;
+	} server_id;
 }
diff --git a/source4/librpc/idl/notify.idl b/source4/librpc/idl/notify.idl
index cf544f3a68..eecdd86d59 100644
--- a/source4/librpc/idl/notify.idl
+++ b/source4/librpc/idl/notify.idl
@@ -15,7 +15,7 @@ interface notify
 
 	/* structure used in the notify database */
 	typedef [public] struct {
-		uint32 server;
+		server_id server;
 		uint32 filter; /* filter to apply in this directory */
 		uint32 subdir_filter; /* filter to apply in child directories */
 		utf8string path;
diff --git a/source4/librpc/idl/opendb.idl b/source4/librpc/idl/opendb.idl
index 8d1c30761c..eaa626e89d 100644
--- a/source4/librpc/idl/opendb.idl
+++ b/source4/librpc/idl/opendb.idl
@@ -7,13 +7,15 @@
    ntvfs/common/opendb.c
 */
 
+import "misc.idl";
+
 [
   pointer_default(unique)
 ]
 interface opendb
 {
 	typedef struct {
-		uint32 server;
+		server_id server;
 		uint32 stream_id;
 		uint32 share_access;
 		uint32 access_mask;
@@ -25,7 +27,7 @@ interface opendb
 	} opendb_entry;
 
 	typedef struct {
-		uint32 server;
+		server_id server;
 		pointer notify_ptr;
 	} opendb_pending;