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 <abartlet@samba.org>

diff --git a/source4/cluster/cluster.c b/source4/cluster/cluster.c
index b3fc9c2caf19f3cb3ea1c24c5d3e4d952c157db5..746c0048202841411d54b0b873e28bae1a5e8bf2 100644 (file)
--- 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 8de58a398fd0c31b18256553db01d07278249e90..6cfcb9b21b387c35a9d9fbeaecbf80d8de347fad 100644 (file)
--- 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 96d1d53d4a433638c63f95f0b3a2c44ef8d41b02..2d910d1e28fb25e9c4f034c5be158577d10fdd52 100644 (file)
--- 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 75990e3705af9237eeabf8cedc890b20063c6e92..4bc6d8c5093bff269654b27e75ceee5f695a1f51 100644 (file)
--- 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 aece5efd09a81678f67c8bad9596528c76fc7237..358d205b53b53039bfeacb51e7d58a370fe275b3 100644 (file)
--- 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 b76992960afd13a47e6a80c48016d35dea698031..4973cd09826a80cbc60245145a5a20f01eb8f619 100644 (file)
--- 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 1d4c33470d4c90792fc87b5f00f010d7659f51b8..89ade2991c953d09c80742bea88feb60e2bb7106 100644 (file)
--- 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_id4.idl
similarity index 100%
rename from source4/librpc/idl/server_id.idl
rename to source4/librpc/idl/server_id4.idl

diff --git a/source4/librpc/idl/wscript_build b/source4/librpc/idl/wscript_build
index aae98a26331178406df41f0545af114ece0518c1..6fe3690b335782734b5f3dd1978934413eb55212 100644 (file)
--- 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 983f11a08cbe4e6fef417db1277fc58b55a1891f..afb89fde04d85ac818d987cd6a91cc4c240379d0 100755 (executable)
--- 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 31750dca1dc1f82e4a77aff1a6e632d54b7d1b77..203b588e0870151f758dbec585bbf3acca786306 100644 (file)
--- 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 8e31c944033423ff7fafed6822f691094897171a..08a57495cc54833b469e571ea7cde99aed0297f9 100644 (file)
--- 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 202ea5232762066df380a61506899b0083f06d6c..02ade716d287e4f02367c18f1c28f341dd187ef4 100644 (file)
--- 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 69ecb1b970be2c63570fd921f93d9f409b06330d..b8954073e5a5394e8850f46377ee628db5d799a0 100644 (file)
--- 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;