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/cluster/cluster.c | 2 +- source4/cluster/cluster.h | 2 +- source4/cluster/local.c | 2 +- source4/lib/messaging/messaging.h | 2 +- source4/lib/messaging/pymessaging.c | 2 +- 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 ++-- source4/ntvfs/ntvfs.h | 2 +- source4/rpc_server/dcerpc_server.h | 2 +- source4/smbd/service_stream.h | 2 +- source4/smbd/service_task.h | 2 +- 15 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 source4/librpc/idl/server_id.idl create mode 100644 source4/librpc/idl/server_id4.idl diff --git a/source4/cluster/cluster.c b/source4/cluster/cluster.c index b3fc9c2caf..746c004820 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/server_id.h" +#include "librpc/gen_ndr/server_id4.h" static struct cluster_ops *ops; diff --git a/source4/cluster/cluster.h b/source4/cluster/cluster.h index 8de58a398f..6cfcb9b21b 100644 --- a/source4/cluster/cluster.h +++ b/source4/cluster/cluster.h @@ -22,7 +22,7 @@ #ifndef __CLUSTER_H__ #define __CLUSTER_H__ -#include "librpc/gen_ndr/server_id.h" +#include "librpc/gen_ndr/server_id4.h" /* test for same cluster id diff --git a/source4/cluster/local.c b/source4/cluster/local.c index 96d1d53d4a..2d910d1e28 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/server_id.h" +#include "librpc/gen_ndr/server_id4.h" /* server a server_id for the local node diff --git a/source4/lib/messaging/messaging.h b/source4/lib/messaging/messaging.h index 75990e3705..4bc6d8c509 100644 --- a/source4/lib/messaging/messaging.h +++ b/source4/lib/messaging/messaging.h @@ -21,7 +21,7 @@ #ifndef _MESSAGES_H_ #define _MESSAGES_H_ -#include "librpc/gen_ndr/server_id.h" +#include "librpc/gen_ndr/server_id4.h" struct messaging_context; diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c index aece5efd09..358d205b53 100644 --- a/source4/lib/messaging/pymessaging.c +++ b/source4/lib/messaging/pymessaging.c @@ -31,7 +31,7 @@ #include "param/param.h" #include "param/pyparam.h" #include "librpc/rpc/dcerpc.h" -#include "librpc/gen_ndr/server_id.h" +#include "librpc/gen_ndr/server_id4.h" void initmessaging(void); 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' ) diff --git a/source4/ntvfs/ntvfs.h b/source4/ntvfs/ntvfs.h index 31750dca1d..203b588e08 100644 --- a/source4/ntvfs/ntvfs.h +++ b/source4/ntvfs/ntvfs.h @@ -24,7 +24,7 @@ #include "libcli/raw/interfaces.h" #include "param/share.h" #include "librpc/gen_ndr/security.h" -#include "librpc/gen_ndr/server_id.h" +#include "librpc/gen_ndr/server_id4.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 8e31c94403..08a57495cc 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/server_id.h" +#include "librpc/gen_ndr/server_id4.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 202ea52327..02ade716d2 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/server_id.h" +#include "librpc/gen_ndr/server_id4.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 69ecb1b970..b8954073e5 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/server_id.h" +#include "librpc/gen_ndr/server_id4.h" struct task_server { struct tevent_context *event_ctx; -- cgit