sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-30 06:50:24 +03:00
Code

r19588: Use include and import statements rather than depends() and helper().

Browse Source 
(This used to be commit 347ae9628202ca4de4318ef8156999239aad9192)
This commit is contained in:
Jelmer Vernooij 2006-11-06 22:54:49 +00:00 committed by Gerald (Jerry) Carter
parent 4e61cee33c
commit 863dcbfa06
28 changed files with 1513 additions and 1454 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source4/librpc/idl/dcerpc.idl
View File

@ -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
{

5
source4/librpc/idl/drsblobs.idl
View File

@ -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;

5
source4/librpc/idl/drsuapi.idl
View File

@ -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
{

3
source4/librpc/idl/efs.idl
View File

@ -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
{

4
source4/librpc/idl/eventlog.idl
View File

@ -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

5
source4/librpc/idl/irpc.idl
View File

@ -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 {

5
source4/librpc/idl/krb5pac.idl
View File

@ -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
{

5
source4/librpc/idl/lsa.idl
View File

@ -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;

9
source4/librpc/idl/nbt.idl
View File

@ -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";

5
source4/librpc/idl/netlogon.idl
View File

@ -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

5
source4/librpc/idl/nfs4acl.idl
View File

@ -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
{

5
source4/librpc/idl/oxidresolver.idl
View File

@ -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
{

5
source4/librpc/idl/remact.idl
View File

@ -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
{

3
source4/librpc/idl/rot.idl
View File

@ -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

4
source4/librpc/idl/samr.idl
View File

@ -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;

5
source4/librpc/idl/schannel.idl
View File

@ -4,9 +4,8 @@
schannel structures
*/
[
depends(netlogon,nbt)
]
import "netlogon.idl", "nbt.idl";
interface schannel
{
/*

5
source4/librpc/idl/security.idl
View File

@ -4,9 +4,10 @@
security IDL structures
*/
import "misc.idl";
[
pointer_default(unique),
depends(misc,security)
pointer_default(unique)
]
interface security
{

2
source4/librpc/idl/spoolss.idl
View File

@ -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
{

4
source4/librpc/idl/srvsvc.idl
View File

@ -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;

5
source4/librpc/idl/unixinfo.idl
View File

@ -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
{
/******************/

5
source4/librpc/idl/winbind.idl
View File

@ -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

5
source4/librpc/idl/winreg.idl
View File

@ -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;

5
source4/librpc/idl/winsrepl.idl
View File

@ -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
{

5
source4/librpc/idl/wkssvc.idl
View File

@ -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;

3
source4/librpc/idl/xattr.idl
View File

@ -8,8 +8,9 @@
about a file in a architecture independent manner
*/
import "security.idl";
[
depends(security),
pointer_default(unique)
]
interface xattr

17
source4/pidl/idl.yp
View File

@ -23,28 +23,33 @@ idl:
| idl importlib { push(@{$_[1]}, $_[2]); $_[1] }
;
import: 'import' commalisttext ';' {{
import: 'import' commalist ';' {{
"TYPE" => "IMPORT",
"PATHS" => [ $_[2] ],
"PATHS" => $_[2],
"FILE" => $_[0]->YYData->{INPUT_FILENAME},
"LINE" => $_[0]->YYData->{LINE}
}}
;
include: 'import' commalisttext ';' {{
include: 'include' commalist ';' {{
"TYPE" => "INCLUDE",
"PATHS" => [ $_[2] ],
"PATHS" => $_[2],
"FILE" => $_[0]->YYData->{INPUT_FILENAME},
"LINE" => $_[0]->YYData->{LINE}
}}
;
importlib: 'importlib' commalisttext ';' {{
importlib: 'importlib' commalist ';' {{
"TYPE" => "IMPORTLIB",
"PATHS" => [ $_[2] ],
"PATHS" => $_[2],
"FILE" => $_[0]->YYData->{INPUT_FILENAME},
"LINE" => $_[0]->YYData->{LINE}
}}
;
commalist:
text { [ $_[1] ] }
| commalist ',' text { push(@{$_[1]}, $_[3]); $_[1] }
;
coclass: property_list 'coclass' identifier '{' interface_names '}' optional_semicolon
{{
"TYPE" => "COCLASS",

2831
source4/pidl/lib/Parse/Pidl/IDL.pm
View File

File diff suppressed because it is too large Load Diff

2
source4/pidl/lib/Parse/Pidl/Samba4/Header.pm
View File

@ -321,7 +321,7 @@ sub HeaderInclude
{
my @includes = @_;
foreach (@includes) {
pidl "#include \"$_\"\n";
pidl "#include $_\n";
}
}