diff options
Diffstat (limited to 'source3/librpc/idl')
| -rw-r--r-- | source3/librpc/idl/messaging.idl | 3 | ||||
| -rw-r--r-- | source3/librpc/idl/notify.idl | 3 | ||||
| -rw-r--r-- | source3/librpc/idl/server_id.idl | 25 | ||||
| -rw-r--r-- | source3/librpc/idl/wscript_build | 2 |
4 files changed, 29 insertions, 4 deletions
diff --git a/source3/librpc/idl/messaging.idl b/source3/librpc/idl/messaging.idl index 0ac7220995..36f064f23d 100644 --- a/source3/librpc/idl/messaging.idl +++ b/source3/librpc/idl/messaging.idl @@ -1,11 +1,12 @@ #include "idl_types.h" +import "server_id.idl"; + /* IDL structures for messaging code */ [ - helper("../librpc/ndr/ndr_server_id.h"), pointer_default(unique) ] interface messaging diff --git a/source3/librpc/idl/notify.idl b/source3/librpc/idl/notify.idl index d65e8c5f86..0776ed107c 100644 --- a/source3/librpc/idl/notify.idl +++ b/source3/librpc/idl/notify.idl @@ -1,6 +1,6 @@ #include "idl_types.h" -import "file_id.idl"; +import "file_id.idl", "server_id.idl"; /* IDL structures for notify change code @@ -10,7 +10,6 @@ import "file_id.idl"; */ [ - helper("../librpc/ndr/ndr_server_id.h"), pointer_default(unique) ] interface notify diff --git a/source3/librpc/idl/server_id.idl b/source3/librpc/idl/server_id.idl new file mode 100644 index 0000000000..ed727881c7 --- /dev/null +++ b/source3/librpc/idl/server_id.idl @@ -0,0 +1,25 @@ +[ + pointer_default(unique) +] +interface server_id +{ + + /* used to look like the following, note that unique_id was not + * marshalled at all... + + struct server_id { + pid_t pid; + #ifdef CLUSTER_SUPPORT + uint32 vnn; + #endif + uint64_t unique_id; + }; + + */ + + typedef [public] struct { + uint32 pid; + uint32 vnn; + udlong unique_id; + } server_id; +} diff --git a/source3/librpc/idl/wscript_build b/source3/librpc/idl/wscript_build index a337f4f39a..e24475b543 100644 --- a/source3/librpc/idl/wscript_build +++ b/source3/librpc/idl/wscript_build @@ -2,7 +2,7 @@ bld.SAMBA_PIDL_LIST('PIDL', '''messaging.idl libnetapi.idl notify.idl - perfcount.idl secrets.idl libnet_join.idl''', + perfcount.idl secrets.idl libnet_join.idl server_id.idl''', options='--includedir=../librpc/idl --header --ndr-parser', output_dir='../gen_ndr') |