summaryrefslogtreecommitdiff
path: root/source4/librpc/idl
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-11-06 22:54:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:24:58 -0500
commit863dcbfa06cfcd4eecba7559c03080321b9a8a91 (patch)
tree8805de459397bf5d336979b6ed75abc4a2d7fa43 /source4/librpc/idl
parent4e61cee33c87d479e1bf0f11ecf9e84299bc7544 (diff)
downloadsamba-863dcbfa06cfcd4eecba7559c03080321b9a8a91.tar.gz
samba-863dcbfa06cfcd4eecba7559c03080321b9a8a91.tar.bz2
samba-863dcbfa06cfcd4eecba7559c03080321b9a8a91.zip
r19588: Use include and import statements rather than depends() and helper().
(This used to be commit 347ae9628202ca4de4318ef8156999239aad9192)
Diffstat (limited to 'source4/librpc/idl')
-rw-r--r--source4/librpc/idl/dcerpc.idl5
-rw-r--r--source4/librpc/idl/drsblobs.idl5
-rw-r--r--source4/librpc/idl/drsuapi.idl5
-rw-r--r--source4/librpc/idl/efs.idl3
-rw-r--r--source4/librpc/idl/eventlog.idl4
-rw-r--r--source4/librpc/idl/irpc.idl5
-rw-r--r--source4/librpc/idl/krb5pac.idl5
-rw-r--r--source4/librpc/idl/lsa.idl5
-rw-r--r--source4/librpc/idl/nbt.idl9
-rw-r--r--source4/librpc/idl/netlogon.idl5
-rw-r--r--source4/librpc/idl/nfs4acl.idl5
-rw-r--r--source4/librpc/idl/oxidresolver.idl5
-rw-r--r--source4/librpc/idl/remact.idl5
-rw-r--r--source4/librpc/idl/rot.idl3
-rw-r--r--source4/librpc/idl/samr.idl4
-rw-r--r--source4/librpc/idl/schannel.idl5
-rw-r--r--source4/librpc/idl/security.idl5
-rw-r--r--source4/librpc/idl/spoolss.idl2
-rw-r--r--source4/librpc/idl/srvsvc.idl4
-rw-r--r--source4/librpc/idl/unixinfo.idl5
-rw-r--r--source4/librpc/idl/winbind.idl5
-rw-r--r--source4/librpc/idl/winreg.idl5
-rw-r--r--source4/librpc/idl/winsrepl.idl5
-rw-r--r--source4/librpc/idl/wkssvc.idl5
-rw-r--r--source4/librpc/idl/xattr.idl3
25 files changed, 69 insertions, 48 deletions
diff --git a/source4/librpc/idl/dcerpc.idl b/source4/librpc/idl/dcerpc.idl
index 5bf2780e23..20263b4e80 100644
--- a/source4/librpc/idl/dcerpc.idl
+++ b/source4/librpc/idl/dcerpc.idl
@@ -8,9 +8,10 @@
see http://www.opengroup.org/onlinepubs/9629399/chap12.htm for packet
layouts
*/
+import "misc.idl";
+
[
-pointer_default(unique),
-depends(misc)
+pointer_default(unique)
]
interface dcerpc
{
diff --git a/source4/librpc/idl/drsblobs.idl b/source4/librpc/idl/drsblobs.idl
index a398fb45a0..aa1c28300f 100644
--- a/source4/librpc/idl/drsblobs.idl
+++ b/source4/librpc/idl/drsblobs.idl
@@ -1,11 +1,12 @@
#include "idl_types.h"
+import "drsuapi.idl";
+
[
uuid("12345778-1234-abcd-0001-00000001"),
version(0.0),
pointer_default(unique),
- helpstring("Active Directory Replication LDAP Blobs"),
- depends(drsuapi)
+ helpstring("Active Directory Replication LDAP Blobs")
]
interface drsblobs {
declare bitmap drsuapi_DsReplicaSyncOptions;
diff --git a/source4/librpc/idl/drsuapi.idl b/source4/librpc/idl/drsuapi.idl
index aa87676c9d..0504c0d442 100644
--- a/source4/librpc/idl/drsuapi.idl
+++ b/source4/librpc/idl/drsuapi.idl
@@ -1,13 +1,14 @@
#include "idl_types.h"
+import "security.idl", "misc.idl", "samr.idl";
+
[
uuid("e3514235-4b06-11d1-ab04-00c04fc2dcd2"),
version(4.0),
endpoint("ncacn_np:[\\pipe\\lsass]","ncacn_np:[\\pipe\\protected_storage]", "ncacn_ip_tcp:", "ncalrpc:"),
authservice("ldap"),
helpstring("Active Directory Replication"),
- pointer_default(unique),
- depends(security,misc,samr)
+ pointer_default(unique)
]
interface drsuapi
{
diff --git a/source4/librpc/idl/efs.idl b/source4/librpc/idl/efs.idl
index 75d997a018..62fefda606 100644
--- a/source4/librpc/idl/efs.idl
+++ b/source4/librpc/idl/efs.idl
@@ -3,10 +3,11 @@
by Jean-Baptiste Marchand
*/
+import "security.idl";
+
[
uuid("c681d488-d850-11d0-8c52-00c04fd90f7e"),
version(1.0),
- depends(security),
pointer_default(unique)
] interface efs
{
diff --git a/source4/librpc/idl/eventlog.idl b/source4/librpc/idl/eventlog.idl
index 38f4a88e28..0aa3faff4a 100644
--- a/source4/librpc/idl/eventlog.idl
+++ b/source4/librpc/idl/eventlog.idl
@@ -3,9 +3,11 @@
/*
eventlog interface definition
*/
+
+import "lsa.idl", "security.idl";
+
[ uuid("82273fdc-e32a-18c3-3f78-827929dc23ea"),
version(0.0),
- depends(lsa,security),
pointer_default(unique),
helpstring("Event Logger")
] interface eventlog
diff --git a/source4/librpc/idl/irpc.idl b/source4/librpc/idl/irpc.idl
index 5614608bd7..eb3d159c7d 100644
--- a/source4/librpc/idl/irpc.idl
+++ b/source4/librpc/idl/irpc.idl
@@ -1,12 +1,13 @@
#include "idl_types.h"
+import "security.idl", "nbt.idl";
+
/*
definitions for irpc primitives
*/
[ uuid("e770c620-0b06-4b5e-8d87-a26e20f28340"),
version(1.0),
- pointer_default(unique),
- depends(security,nbt)
+ pointer_default(unique)
] interface irpc
{
typedef bitmap {
diff --git a/source4/librpc/idl/krb5pac.idl b/source4/librpc/idl/krb5pac.idl
index 229ce3402d..da25f3e92a 100644
--- a/source4/librpc/idl/krb5pac.idl
+++ b/source4/librpc/idl/krb5pac.idl
@@ -4,12 +4,13 @@
#include "idl_types.h"
+import "security.idl", "netlogon.idl", "samr.idl";
+
[
uuid("12345778-1234-abcd-0000-00000000"),
version(0.0),
pointer_default(unique),
- helpstring("Active Directory KRB5 PAC"),
- depends(security,netlogon,samr)
+ helpstring("Active Directory KRB5 PAC")
]
interface krb5pac
{
diff --git a/source4/librpc/idl/lsa.idl b/source4/librpc/idl/lsa.idl
index 1e941e6f3b..556ab21af4 100644
--- a/source4/librpc/idl/lsa.idl
+++ b/source4/librpc/idl/lsa.idl
@@ -4,12 +4,13 @@
lsa interface definition
*/
+import "security.idl";
+
[ uuid("12345778-1234-abcd-ef00-0123456789ab"),
version(0.0),
endpoint("ncacn_np:[\\pipe\\lsarpc]","ncacn_np:[\\pipe\\netlogon]","ncacn_np:[\\pipe\\lsass]", "ncacn_ip_tcp:", "ncalrpc:"),
pointer_default(unique),
- helpstring("Local Security Authority"),
- depends(security)
+ helpstring("Local Security Authority")
] interface lsarpc
{
declare bitmap security_secinfo;
diff --git a/source4/librpc/idl/nbt.idl b/source4/librpc/idl/nbt.idl
index 4c5a8a83f7..829589f3b0 100644
--- a/source4/librpc/idl/nbt.idl
+++ b/source4/librpc/idl/nbt.idl
@@ -8,10 +8,9 @@
encoding if it doesn't work out
*/
-[
- depends(security,svcctl),
- helper("libcli/nbt/nbtname.h")
-] interface nbt
+import "security.idl", "svcctl.idl";
+
+interface nbt
{
const int NBT_NAME_SERVICE_PORT = 137;
const int NBT_DGRAM_SERVICE_PORT = 138;
@@ -697,3 +696,5 @@
[switch_is(opcode)] nbt_browse_payload payload;
} nbt_browse_packet;
}
+
+include "libcli/nbt/nbtname.h";
diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl
index ffceab002d..918994661a 100644
--- a/source4/librpc/idl/netlogon.idl
+++ b/source4/librpc/idl/netlogon.idl
@@ -4,6 +4,8 @@
who contributed!
*/
+import "lsa.idl", "samr.idl", "security.idl";
+
#include "idl_types.h"
[
@@ -11,8 +13,7 @@
version(1.0),
endpoint("ncacn_np:[\\pipe\\netlogon]","ncacn_ip_tcp:","ncalrpc:"),
pointer_default(unique),
- pointer_default_top(unique),
- depends(lsa,samr,security)
+ pointer_default_top(unique)
]
interface netlogon
diff --git a/source4/librpc/idl/nfs4acl.idl b/source4/librpc/idl/nfs4acl.idl
index dc136150f4..3d4379ad5e 100644
--- a/source4/librpc/idl/nfs4acl.idl
+++ b/source4/librpc/idl/nfs4acl.idl
@@ -5,10 +5,11 @@
see http://www.suse.de/~agruen/nfs4acl/
*/
+import "misc.idl", "security.idl";
+
[ uuid("18763978-8625-abc3-54ca-9892bacdf321"),
version(1.0),
- pointer_default(unique),
- depends(misc,security)
+ pointer_default(unique)
]
interface nfs4acl
{
diff --git a/source4/librpc/idl/oxidresolver.idl b/source4/librpc/idl/oxidresolver.idl
index 12c5947265..3bf7b33334 100644
--- a/source4/librpc/idl/oxidresolver.idl
+++ b/source4/librpc/idl/oxidresolver.idl
@@ -10,13 +10,14 @@
(used by DCOM)
*/
+import "dcom.idl", "orpc.idl";
+
[
uuid("99fcfec4-5260-101b-bbcb-00aa0021347a"),
helpstring("Object Exporter ID Resolver"),
endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]", "ncalrpc:"),
pointer_default(unique),
- pointer_default_top(unique),
- depends(dcom, orpc)
+ pointer_default_top(unique)
]
interface IOXIDResolver
{
diff --git a/source4/librpc/idl/remact.idl b/source4/librpc/idl/remact.idl
index 16ac5f60c1..26917fd715 100644
--- a/source4/librpc/idl/remact.idl
+++ b/source4/librpc/idl/remact.idl
@@ -3,12 +3,13 @@
http://www.grimes.demon.co.uk/DCOM/DCOMSpec.htm
*/
+import "dcom.idl", "orpc.idl";
+
[
uuid("4d9f4ab8-7d1c-11cf-861e-0020af6e7c57"),
pointer_default(unique),
pointer_default_top(unique),
- endpoint("ncalrpc:", "ncacn_ip_tcp:[135]", "ncacn_np:[\\pipe\\epmapper]"),
- depends(dcom,orpc)
+ endpoint("ncalrpc:", "ncacn_ip_tcp:[135]", "ncacn_np:[\\pipe\\epmapper]")
]
interface IRemoteActivation
{
diff --git a/source4/librpc/idl/rot.idl b/source4/librpc/idl/rot.idl
index abc210aa35..0ba616259d 100644
--- a/source4/librpc/idl/rot.idl
+++ b/source4/librpc/idl/rot.idl
@@ -1,9 +1,10 @@
+import "orpc.idl";
+
[
uuid("b9e79e60-3d52-11ce-aaa1-00006901293f"),
version(0.2),
pointer_default(unique),
pointer_default_top(unique),
- depends(orpc),
endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]",
"ncalrpc:[EPMAPPER]")
] interface rot
diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl
index a8b949e203..9989c821f0 100644
--- a/source4/librpc/idl/samr.idl
+++ b/source4/librpc/idl/samr.idl
@@ -3,6 +3,7 @@
/*
samr interface definition
*/
+import "misc.idl", "lsa.idl", "security.idl";
/*
Thanks to Todd Sabin for some information from his samr.idl in acltools
@@ -12,8 +13,7 @@
version(1.0),
endpoint("ncacn_np:[\\pipe\\samr]","ncacn_ip_tcp:", "ncalrpc:"),
pointer_default(unique),
- pointer_default_top(unique),
- depends(misc,lsa,security)
+ pointer_default_top(unique)
] interface samr
{
declare bitmap security_secinfo;
diff --git a/source4/librpc/idl/schannel.idl b/source4/librpc/idl/schannel.idl
index f3c84c591a..9cb9e1fb61 100644
--- a/source4/librpc/idl/schannel.idl
+++ b/source4/librpc/idl/schannel.idl
@@ -4,9 +4,8 @@
schannel structures
*/
-[
- depends(netlogon,nbt)
-]
+import "netlogon.idl", "nbt.idl";
+
interface schannel
{
/*
diff --git a/source4/librpc/idl/security.idl b/source4/librpc/idl/security.idl
index 8bf5e6f867..de5f135dd2 100644
--- a/source4/librpc/idl/security.idl
+++ b/source4/librpc/idl/security.idl
@@ -4,9 +4,10 @@
security IDL structures
*/
+import "misc.idl";
+
[
- pointer_default(unique),
- depends(misc,security)
+ pointer_default(unique)
]
interface security
{
diff --git a/source4/librpc/idl/spoolss.idl b/source4/librpc/idl/spoolss.idl
index 3e900c95ce..4ffe6ed790 100644
--- a/source4/librpc/idl/spoolss.idl
+++ b/source4/librpc/idl/spoolss.idl
@@ -3,6 +3,7 @@
/*
spoolss interface definitions
*/
+import "security.idl";
[ uuid("12345678-1234-abcd-ef00-0123456789ab"),
version(1.0),
@@ -10,7 +11,6 @@
pointer_default(unique),
pointer_default_top(unique),
helpstring("Spooler SubSystem"),
- depends(security),
helper("librpc/ndr/ndr_spoolss_buf.h")
] interface spoolss
{
diff --git a/source4/librpc/idl/srvsvc.idl b/source4/librpc/idl/srvsvc.idl
index ade1a7ee0b..8fb539086a 100644
--- a/source4/librpc/idl/srvsvc.idl
+++ b/source4/librpc/idl/srvsvc.idl
@@ -3,14 +3,14 @@
/*
srvsvc interface definitions
*/
+import "security.idl", "svcctl.idl";
[ uuid("4b324fc8-1670-01d3-1278-5a47bf6ee188"),
version(3.0),
endpoint("ncacn_np:[\\pipe\\srvsvc]", "ncacn_ip_tcp:", "ncalrpc:"),
pointer_default(unique),
pointer_default_top(unique),
- helpstring("Server Service"),
- depends(security,svcctl)
+ helpstring("Server Service")
] interface srvsvc
{
declare bitmap svcctl_ServerType;
diff --git a/source4/librpc/idl/unixinfo.idl b/source4/librpc/idl/unixinfo.idl
index 4b12a3056a..c674329e52 100644
--- a/source4/librpc/idl/unixinfo.idl
+++ b/source4/librpc/idl/unixinfo.idl
@@ -3,12 +3,13 @@
Unixinfo interface definition
*/
+import "security.idl";
+
[ uuid("9c54e310-a955-4885-bd31-78787147dfa6"),
version(0.0),
endpoint("ncacn_np:[\\pipe\\unixinfo]", "ncacn_ip_tcp:", "ncalrpc:"),
pointer_default(unique),
- helpstring("Unixinfo specific stuff"),
- depends(security)
+ helpstring("Unixinfo specific stuff")
] interface unixinfo
{
/******************/
diff --git a/source4/librpc/idl/winbind.idl b/source4/librpc/idl/winbind.idl
index c3f54e0132..ad66090401 100644
--- a/source4/librpc/idl/winbind.idl
+++ b/source4/librpc/idl/winbind.idl
@@ -3,13 +3,14 @@
*/
#include "idl_types.h"
+
+import "netlogon.idl";
[
uuid("245f3e6b-3c5d-6e21-3a2d-2a3d645b7221"),
version(1.0),
pointer_default(unique),
- pointer_default_top(unique),
- depends(netlogon)
+ pointer_default_top(unique)
]
interface winbind
diff --git a/source4/librpc/idl/winreg.idl b/source4/librpc/idl/winreg.idl
index 03b034b38f..2804b19964 100644
--- a/source4/librpc/idl/winreg.idl
+++ b/source4/librpc/idl/winreg.idl
@@ -2,14 +2,15 @@
winreg interface definition
*/
+import "lsa.idl", "initshutdown.idl", "security.idl";
+
[
uuid("338cd001-2244-31f1-aaaa-900038001003"),
version(1.0),
endpoint("ncacn_np:[\\pipe\\winreg]","ncacn_ip_tcp:","ncalrpc:"),
pointer_default(unique),
pointer_default_top(unique),
- helpstring("Remote Registry Service"),
- depends(lsa,initshutdown,security)
+ helpstring("Remote Registry Service")
] interface winreg
{
declare bitmap security_secinfo;
diff --git a/source4/librpc/idl/winsrepl.idl b/source4/librpc/idl/winsrepl.idl
index d16444e346..fb590d27c9 100644
--- a/source4/librpc/idl/winsrepl.idl
+++ b/source4/librpc/idl/winsrepl.idl
@@ -9,10 +9,11 @@
Written by Andrew Tridgell <tridge@osdl.org>
*/
+import "nbt.idl";
+
[
pointer_default(unique),
- pointer_default_top(unique),
- depends(nbt)
+ pointer_default_top(unique)
]
interface wrepl
{
diff --git a/source4/librpc/idl/wkssvc.idl b/source4/librpc/idl/wkssvc.idl
index d658091c47..3ee88bcac1 100644
--- a/source4/librpc/idl/wkssvc.idl
+++ b/source4/librpc/idl/wkssvc.idl
@@ -2,12 +2,13 @@
wkssvc interface definitions
*/
+import "srvsvc.idl";
+
[ uuid("6bffd098-a112-3610-9833-46c3f87e345a"),
version(1.0),
pointer_default(unique),
pointer_default_top(unique),
- helpstring("Workstation Service"),
- depends(srvsvc)
+ helpstring("Workstation Service")
] interface wkssvc
{
declare [v1_enum] enum srvsvc_PlatformId;
diff --git a/source4/librpc/idl/xattr.idl b/source4/librpc/idl/xattr.idl
index 36be31c48a..7e73baee7d 100644
--- a/source4/librpc/idl/xattr.idl
+++ b/source4/librpc/idl/xattr.idl
@@ -8,8 +8,9 @@
about a file in a architecture independent manner
*/
+import "security.idl";
+
[
- depends(security),
pointer_default(unique)
]
interface xattr