diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-02 10:55:20 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-09 12:40:08 +0200 |
| commit | d057116cc2e454ba097d0dcb22e16108a05a4a1b (patch) | |
| tree | aee1503507f6a5d54b92284a57f758b80fa70820 /source3 | |
| parent | 174893c312f700105f8cda069cdb3b51a5aa602c (diff) | |
| download | samba-d057116cc2e454ba097d0dcb22e16108a05a4a1b.tar.gz samba-d057116cc2e454ba097d0dcb22e16108a05a4a1b.tar.bz2 samba-d057116cc2e454ba097d0dcb22e16108a05a4a1b.zip | |
server_id.idl: Bring server_id.idl in common
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 3 | ||||
| -rw-r--r-- | source3/librpc/idl/server_id.idl | 26 | ||||
| -rw-r--r-- | source3/librpc/idl/wscript_build | 2 | ||||
| -rw-r--r-- | source3/librpc/wscript_build | 5 |
4 files changed, 2 insertions, 34 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index d4b59b95b9..311678d6bb 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1608,8 +1608,7 @@ IDL_FILES = librpc/idl/messaging.idl \ librpc/idl/wbint.idl \ librpc/idl/perfcount.idl \ librpc/idl/secrets.idl \ - librpc/idl/libnet_join.idl \ - librpc/idl/server_id.idl + librpc/idl/libnet_join.idl samba3-idl:: @PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \ diff --git a/source3/librpc/idl/server_id.idl b/source3/librpc/idl/server_id.idl deleted file mode 100644 index 51900000ed..0000000000 --- a/source3/librpc/idl/server_id.idl +++ /dev/null @@ -1,26 +0,0 @@ -[ - 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 { - hyper pid; - uint32 task_id; - uint32 vnn; - udlong unique_id; - } server_id; -} diff --git a/source3/librpc/idl/wscript_build b/source3/librpc/idl/wscript_build index 5a8dc31980..97b14659d1 100644 --- a/source3/librpc/idl/wscript_build +++ b/source3/librpc/idl/wscript_build @@ -6,7 +6,7 @@ topinclude=os.path.join(bld.srcnode.abspath(), 'librpc/idl') bld.SAMBA_PIDL_LIST('PIDL', '''messaging.idl libnetapi.idl notify.idl - perfcount.idl secrets.idl libnet_join.idl server_id.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 d99936cc16..7f18f03258 100644 --- a/source3/librpc/wscript_build +++ b/source3/librpc/wscript_build @@ -10,11 +10,6 @@ bld.SAMBA3_SUBSYSTEM('NDR_LIBNET_JOIN', public_deps='ndr' ) -bld.SAMBA3_SUBSYSTEM('NDR_SERVER_ID', - source='gen_ndr/ndr_server_id.c', - public_deps='ndr' - ) - bld.SAMBA3_SUBSYSTEM('NDR_MESSAGING', source='gen_ndr/ndr_messaging.c', public_deps='ndr NDR_SERVER_ID' |