server_id.idl: Bring server_id.idl in common

Andrew Bartlett

Signed-off-by: Andrew Tridgell <tridge@samba.org>

19 files changed, 23 insertions, 29 deletions

diff --git a/source3/librpc/idl/server_id.idl b/librpc/idl/server_id.idl
index 51900000ed..51900000ed 100644
--- a/source3/librpc/idl/server_id.idl
+++ b/librpc/idl/server_id.idl
diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index 7e1340e6f7..1c5d6ec746 100644
--- a/librpc/idl/wscript_build
+++ b/librpc/idl/wscript_build
@@ -8,7 +8,7 @@ bld.SAMBA_PIDL_LIST('PIDL',
                        browser.idl dfs.idl dssetup.idl frsapi.idl krb5pac.idl
                        named_pipe_auth.idl orpc.idl rot.idl spoolss.idl w32time.idl xattr.idl
                        dbgidl.idl dnsserver.idl echo.idl frsrpc.idl lsa.idl nbt.idl dns.idl
-                       oxidresolver.idl samr.idl srvsvc.idl winreg.idl dcerpc.idl
+                       oxidresolver.idl samr.idl server_id.idl srvsvc.idl winreg.idl dcerpc.idl
                        drsblobs.idl efs.idl frstrans.idl mgmt.idl netlogon.idl
                        policyagent.idl scerpc.idl svcctl.idl wkssvc.idl eventlog6.idl backupkey.idl
                        printcap.idl''',
diff --git a/librpc/wscript_build b/librpc/wscript_build
index d8b3fe78ff..56959062f2 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -175,6 +175,13 @@ bld.SAMBA_SUBSYSTEM('NDR_SCERPC',
 	public_deps='ndr'
 	)
 
+bld.SAMBA_SUBSYSTEM('NDR_SERVER_ID',
+	source='gen_ndr/ndr_server_id.c',
+	deps='ndr',
+	public_headers='gen_ndr/server_id.h',
+	header_path='gen_ndr'
+	)
+
 bld.SAMBA_SUBSYSTEM('NDR_TRKWKS',
 	source='gen_ndr/ndr_trkwks.c',
 	public_deps='ndr'
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/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'
diff --git a/source4/cluster/cluster.c b/source4/cluster/cluster.c
index 9dcec2e3e0..767e6a719f 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_id4.h"
+#include "librpc/gen_ndr/server_id.h"
 
 static struct cluster_ops *ops;
 
diff --git a/source4/cluster/cluster.h b/source4/cluster/cluster.h
index df12c8bb27..a6f74f956c 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_id4.h"
+#include "librpc/gen_ndr/server_id.h"
 
 /*
   test for same cluster id
diff --git a/source4/cluster/local.c b/source4/cluster/local.c
index 7fe3e04c3e..e7b648fc9b 100644
--- a/source4/cluster/local.c
+++ b/source4/cluster/local.c
@@ -26,7 +26,7 @@
 #include "lib/util/tdb_wrap.h"
 #include "system/filesys.h"
 #include "param/param.h"
-#include "librpc/gen_ndr/server_id4.h"
+#include "librpc/gen_ndr/server_id.h"
 
 /*
   server a server_id for the local node
diff --git a/source4/lib/messaging/messaging.h b/source4/lib/messaging/messaging.h
index 14a112f878..eb8a8abc79 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_id4.h"
+#include "librpc/gen_ndr/server_id.h"
 
 struct imessaging_context;
 
diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c
index 63312da5d0..cafd45beae 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_id4.h"
+#include "librpc/gen_ndr/server_id.h"
 
 void initmessaging(void);
 
diff --git a/source4/librpc/idl/opendb.idl b/source4/librpc/idl/opendb.idl
index 4973cd0982..b76992960a 100644
--- a/source4/librpc/idl/opendb.idl
+++ b/source4/librpc/idl/opendb.idl
@@ -7,7 +7,7 @@
    ntvfs/common/opendb.c
 */
 
-import "server_id4.idl";
+import "server_id.idl";
 
 [
   pointer_default(unique)
diff --git a/source4/librpc/idl/s4_notify.idl b/source4/librpc/idl/s4_notify.idl
index 89ade2991c..1d4c33470d 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_id4.idl";
+import "server_id.idl";
 
 [
   pointer_default(unique)
diff --git a/source4/librpc/idl/wscript_build b/source4/librpc/idl/wscript_build
index 6fe3690b33..a35dc79768 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_id4.idl winbind.idl
+                              opendb.idl sasl_helpers.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 e9456074f6..efde567bf8 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -4,13 +4,6 @@ bld.RECURSE('../../librpc/idl')
 bld.RECURSE('../../librpc/tools')
 bld.RECURSE('idl')
 
-bld.SAMBA_SUBSYSTEM('NDR_SERVER_ID4',
-	source='gen_ndr/ndr_server_id4.c',
-	deps='ndr',
-	public_headers='gen_ndr/server_id4.h',
-	header_path='gen_ndr'
-	)
-
 
 bld.SAMBA_SUBSYSTEM('NDR_WINSTATION',
 	source='gen_ndr/ndr_winstation.c',
@@ -52,7 +45,7 @@ bld.SAMBA_SUBSYSTEM('NDR_OPENDB',
 
 bld.SAMBA_SUBSYSTEM('NDR_NOTIFY',
 	source='gen_ndr/ndr_s4_notify.c',
-	public_deps='ndr NDR_SERVER_ID4'
+	public_deps='ndr NDR_SERVER_ID'
 	)
 
 
diff --git a/source4/ntvfs/ntvfs.h b/source4/ntvfs/ntvfs.h
index a31e302dfc..1716687e5f 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_id4.h"
+#include "librpc/gen_ndr/server_id.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 069ba6bb5d..4fcb5c50a1 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_id4.h"
+#include "librpc/gen_ndr/server_id.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 6590bc0ea0..e098a690f1 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_id4.h"
+#include "librpc/gen_ndr/server_id.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 34b41d9f04..ded4590daf 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_id4.h"
+#include "librpc/gen_ndr/server_id.h"
 
 struct task_server {
 	struct tevent_context *event_ctx;