summaryrefslogtreecommitdiff
path: root/source4/librpc
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-05-02 10:55:20 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-06-09 12:40:08 +0200
commitd057116cc2e454ba097d0dcb22e16108a05a4a1b (patch)
treeaee1503507f6a5d54b92284a57f758b80fa70820 /source4/librpc
parent174893c312f700105f8cda069cdb3b51a5aa602c (diff)
downloadsamba-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 'source4/librpc')
-rw-r--r--source4/librpc/idl/opendb.idl2
-rw-r--r--source4/librpc/idl/s4_notify.idl2
-rw-r--r--source4/librpc/idl/wscript_build2
-rwxr-xr-xsource4/librpc/wscript_build9
4 files changed, 4 insertions, 11 deletions
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'
)