From bed374215ff040cc995659d42938be35412a794a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 18 Feb 2011 10:10:30 +1100 Subject: s4-idl: rename s4 server_id.idl to server_id4.idl this avoids a conflict with the new s3 server_id.idl Pair-Programmed-With: Andrew Bartlett --- source4/librpc/idl/opendb.idl | 2 +- source4/librpc/idl/s4_notify.idl | 2 +- source4/librpc/idl/server_id.idl | 12 ------------ source4/librpc/idl/server_id4.idl | 12 ++++++++++++ source4/librpc/idl/wscript_build | 2 +- source4/librpc/wscript_build | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 source4/librpc/idl/server_id.idl create mode 100644 source4/librpc/idl/server_id4.idl (limited to 'source4/librpc') diff --git a/source4/librpc/idl/opendb.idl b/source4/librpc/idl/opendb.idl index b76992960a..4973cd0982 100644 --- a/source4/librpc/idl/opendb.idl +++ b/source4/librpc/idl/opendb.idl @@ -7,7 +7,7 @@ ntvfs/common/opendb.c */ -import "server_id.idl"; +import "server_id4.idl"; [ pointer_default(unique) diff --git a/source4/librpc/idl/s4_notify.idl b/source4/librpc/idl/s4_notify.idl index 1d4c33470d..89ade2991c 100644 --- a/source4/librpc/idl/s4_notify.idl +++ b/source4/librpc/idl/s4_notify.idl @@ -7,7 +7,7 @@ the change notify buffers */ -import "server_id.idl"; +import "server_id4.idl"; [ pointer_default(unique) diff --git a/source4/librpc/idl/server_id.idl b/source4/librpc/idl/server_id.idl deleted file mode 100644 index 486143546b..0000000000 --- a/source4/librpc/idl/server_id.idl +++ /dev/null @@ -1,12 +0,0 @@ -[ - 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/librpc/idl/server_id4.idl b/source4/librpc/idl/server_id4.idl new file mode 100644 index 0000000000..486143546b --- /dev/null +++ b/source4/librpc/idl/server_id4.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/librpc/idl/wscript_build b/source4/librpc/idl/wscript_build index aae98a2633..6fe3690b33 100644 --- a/source4/librpc/idl/wscript_build +++ b/source4/librpc/idl/wscript_build @@ -6,7 +6,7 @@ topinclude=os.path.join(bld.srcnode.abspath(), 'librpc/idl') bld.SAMBA_PIDL_LIST('PIDL', source='''irpc.idl nfs4acl.idl s4_notify.idl ntp_signd.idl - opendb.idl sasl_helpers.idl server_id.idl winbind.idl + opendb.idl sasl_helpers.idl server_id4.idl winbind.idl winsif.idl winsrepl.idl winstation.idl''', options="--includedir=%s --header --ndr-parser --client --python --server" % topinclude, output_dir='../gen_ndr') diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index 983f11a08c..afb89fde04 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -5,9 +5,9 @@ bld.RECURSE('../../librpc/tools') bld.RECURSE('idl') bld.SAMBA_SUBSYSTEM('NDR_SERVER_ID4', - source='gen_ndr/ndr_server_id.c', + source='gen_ndr/ndr_server_id4.c', deps='ndr', - public_headers='gen_ndr/server_id.h', + public_headers='gen_ndr/server_id4.h', header_path='gen_ndr' ) -- cgit