summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-10-16 15:47:28 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:44:48 -0500
commit68d82998d2e3133dd7b743b1cf3a78ee9d052a21 (patch)
treebc6933674a10433e37ee994ad7b65151de7bac7c /source4
parentd68319431e62e43c0ecb23328e3162128d823958 (diff)
downloadsamba-68d82998d2e3133dd7b743b1cf3a78ee9d052a21.tar.gz
samba-68d82998d2e3133dd7b743b1cf3a78ee9d052a21.tar.bz2
samba-68d82998d2e3133dd7b743b1cf3a78ee9d052a21.zip
r11096: Eliminate pointer_default_top()
(This used to be commit b773d848e854394f36351f97130a20a245367b2c)
Diffstat (limited to 'source4')
-rw-r--r--source4/librpc/idl/atsvc.idl17
-rw-r--r--source4/librpc/idl/audiosrv.idl1
-rw-r--r--source4/librpc/idl/browser.idl1
-rw-r--r--source4/librpc/idl/dbgidl.idl2
-rw-r--r--source4/librpc/idl/dcom.idl62
-rw-r--r--source4/librpc/idl/dnsserver.idl1
-rw-r--r--source4/librpc/idl/drsblobs.idl1
-rw-r--r--source4/librpc/idl/drsuapi.idl27
-rw-r--r--source4/librpc/idl/dsbackup.idl1
-rw-r--r--source4/librpc/idl/dssetup.idl3
-rw-r--r--source4/librpc/idl/eventlog.idl19
-rw-r--r--source4/librpc/idl/exchange.idl5
-rw-r--r--source4/librpc/idl/initshutdown.idl11
-rw-r--r--source4/librpc/idl/irpc.idl5
-rw-r--r--source4/librpc/idl/krb5pac.idl1
-rw-r--r--source4/librpc/idl/lsa.idl241
-rw-r--r--source4/librpc/idl/mgmt.idl3
17 files changed, 186 insertions, 215 deletions
diff --git a/source4/librpc/idl/atsvc.idl b/source4/librpc/idl/atsvc.idl
index ad1b66c79b..51904610b2 100644
--- a/source4/librpc/idl/atsvc.idl
+++ b/source4/librpc/idl/atsvc.idl
@@ -7,7 +7,6 @@
[ uuid("1ff70682-0a51-30e8-076d-740be8cee98b"),
version(1.0),
pointer_default(unique),
- pointer_default_top(unique),
helpstring("Microsoft AT-Scheduler Service"),
endpoint("ncacn_np:[\\pipe\\atsvc]", "ncalrpc:")
] interface atsvc
@@ -75,15 +74,15 @@
/******************/
/* Function: 0x00 */
NTSTATUS atsvc_JobAdd(
- [in] unistr *servername,
- [in,ref] atsvc_JobInfo *job_info,
+ [in,unique] unistr *servername,
+ [in] atsvc_JobInfo *job_info,
[out] uint32 job_id
);
/******************/
/* Function: 0x01 */
NTSTATUS atsvc_JobDel(
- [in] unistr *servername,
+ [in,unique] unistr *servername,
[in] uint32 min_job_id,
[in] uint32 max_job_id
);
@@ -105,18 +104,18 @@
/******************/
/* Function: 0x02 */
NTSTATUS atsvc_JobEnum(
- [in] unistr *servername,
- [in,out,ref] atsvc_enum_ctr *ctr,
+ [in,unique] unistr *servername,
+ [in,out] atsvc_enum_ctr *ctr,
[in] uint32 preferred_max_len,
[out] uint32 total_entries,
- [in,out] uint32 *resume_handle
+ [in,out,unique] uint32 *resume_handle
);
/******************/
/* Function: 0x03 */
[public] NTSTATUS atsvc_JobGetInfo(
- [in] unistr *servername,
+ [in,unique] unistr *servername,
[in] uint32 job_id,
- [out] atsvc_JobInfo *job_info
+ [out,unique] atsvc_JobInfo *job_info
);
}
diff --git a/source4/librpc/idl/audiosrv.idl b/source4/librpc/idl/audiosrv.idl
index 2b27b757dd..9b9399ffee 100644
--- a/source4/librpc/idl/audiosrv.idl
+++ b/source4/librpc/idl/audiosrv.idl
@@ -2,7 +2,6 @@
uuid("0a74ef1c-41a4-4e06-83ae-dc74fb1cdd53"),
version(1.0),
pointer_default(unique),
- pointer_default_top(unique),
helpstring("Audio Server")
] interface audiosrv
{
diff --git a/source4/librpc/idl/browser.idl b/source4/librpc/idl/browser.idl
index b2008c7321..5cc2475119 100644
--- a/source4/librpc/idl/browser.idl
+++ b/source4/librpc/idl/browser.idl
@@ -3,7 +3,6 @@
version(0.0),
helpstring("Browsing"),
pointer_default(unique),
- pointer_default_top(unique),
endpoint("ncacn_np:[\\pipe\\browser]", "ncacn_ip_tcp:", "ncalrpc:")
]
interface browser
diff --git a/source4/librpc/idl/dbgidl.idl b/source4/librpc/idl/dbgidl.idl
index 1c21637b74..0712392f00 100644
--- a/source4/librpc/idl/dbgidl.idl
+++ b/source4/librpc/idl/dbgidl.idl
@@ -1,7 +1,7 @@
[
uuid("1d55b526-c137-46c5-ab79-638f2a68e869"),
version(1.0),
- pointer_default(unique),
+ pointer_default(unique),
helpstring("Remote IDL debugger")
] interface dbgidl
{
diff --git a/source4/librpc/idl/dcom.idl b/source4/librpc/idl/dcom.idl
index 0c4293212f..5e881326c5 100644
--- a/source4/librpc/idl/dcom.idl
+++ b/source4/librpc/idl/dcom.idl
@@ -8,7 +8,6 @@
[
uuid("18f70770-8e64-11cf-9af1-0020af6e72f4"),
pointer_default(unique),
- pointer_default_top(unique),
version(0.0)
] interface dcom_Unknown
{
@@ -21,7 +20,6 @@
object,
uuid("00000000-0000-0000-C000-000000000046"),
pointer_default(unique),
- pointer_default_top(unique),
helpstring("Base interface for all COM interfaces")
]
interface IUnknown
@@ -30,8 +28,8 @@ interface IUnknown
/* Function 0x00 */
/* Returns the interface with the specified IID
if implemented by this object */
- [local] WERROR QueryInterface([in] GUID *iid,
- [out,iid_is(riid),ref] IUnknown **data);
+ [local] WERROR QueryInterface([in,unique] GUID *iid,
+ [out,iid_is(riid)] IUnknown **data);
/*****************/
/* Function 0x01 */
@@ -46,13 +44,12 @@ interface IUnknown
[
object,
uuid("00000001-0000-0000-C000-000000000046"),
- pointer_default_top(unique),
pointer_default(unique)
] interface IClassFactory : IUnknown
{
- [local] WERROR CreateInstance([in] MInterfacePointer *pUnknown,
- [in] GUID *iid,
- [out, iid_is(riid)] MInterfacePointer *ppv);
+ [local] WERROR CreateInstance([in,unique] MInterfacePointer *pUnknown,
+ [in,unique] GUID *iid,
+ [out, iid_is(riid),unique] MInterfacePointer *ppv);
[call_as(CreateInstance)] WERROR RemoteCreateInstance();
@@ -73,7 +70,6 @@ interface IUnknown
[
uuid("00000131-0000-0000-C000-000000000046"),
object,
- pointer_default_top(unique),
pointer_default(unique),
helpstring("Remote version of IUnknown")
]
@@ -87,11 +83,11 @@ interface IRemUnknown : IUnknown
REMQIRESULT;
[call_as(QueryInterface)] WERROR RemQueryInterface (
- [in] GUID *ripid, /* interface to QI on */
+ [in,unique] GUID *ripid, /* interface to QI on */
[in] uint32 cRefs, /* count of AddRefs requested */
[in] uint16 cIids, /* count of IIDs that follow */
- [in, size_is(cIids)] GUID *iids, /* IIDs to QI for */
- [out, size_is(cIids)] MInterfacePointer *ip
+ [in, unique, size_is(cIids)] GUID *iids, /* IIDs to QI for */
+ [out, size_is(cIids), unique] MInterfacePointer *ip
);
typedef struct
@@ -104,7 +100,7 @@ interface IRemUnknown : IUnknown
[call_as(AddRef)] WERROR RemAddRef (
[in] uint16 cInterfaceRefs,
[in, size_is(cInterfaceRefs)] REMINTERFACEREF InterfaceRefs[],
- [out, size_is(cInterfaceRefs)] WERROR *pResults
+ [out, size_is(cInterfaceRefs), unique] WERROR *pResults
);
[call_as(Release)] WERROR RemRelease (
@@ -115,7 +111,6 @@ interface IRemUnknown : IUnknown
[
uuid("00000140-0000-0000-c000-000000000046"),
- pointer_default_top(unique),
pointer_default(unique),
object
] interface IClassActivator : IUnknown
@@ -129,7 +124,6 @@ interface IRemUnknown : IUnknown
[
uuid("00000136-0000-0000-c000-000000000046"),
- pointer_default_top(unique),
pointer_default(unique),
object
] interface ISCMLocalActivator : IClassActivator
@@ -139,7 +133,6 @@ interface IRemUnknown : IUnknown
[
pointer_default(unique),
- pointer_default_top(unique),
uuid("c6f3ee72-ce7e-11d1-b71e-00c04fc3111a")
] interface IMachineLocalActivator
{
@@ -148,7 +141,6 @@ interface IRemUnknown : IUnknown
[
pointer_default(unique),
- pointer_default_top(unique),
uuid("e60c73e6-88f9-11cf-9af1-0020af6e72f4")
] interface ILocalObjectExporter
{
@@ -160,7 +152,6 @@ interface IRemUnknown : IUnknown
[
uuid("000001a0-0000-0000-c000-000000000046"),
pointer_default(unique),
- pointer_default_top(unique),
object
]
interface ISystemActivator : IClassActivator
@@ -180,25 +171,23 @@ interface IRemUnknown : IUnknown
[
object,
pointer_default(unique),
- pointer_default_top(unique),
uuid("00000143-0000-0000-C000-000000000046")
]
interface IRemUnknown2 : IRemUnknown
{
[call_as(QueryInterface2)] WERROR RemQueryInterface2 (
- [in] GUID *ripid,
+ [in, unique] GUID *ripid,
[in] uint16 cIids,
- [in, size_is(cIids)] GUID *iids,
- [out, size_is(cIids)] WERROR *phr,
- [out, size_is(cIids)] MInterfacePointer *ppMIF
+ [in, size_is(cIids), unique] GUID *iids,
+ [out, size_is(cIids), unique] WERROR *phr,
+ [out, size_is(cIids), unique] MInterfacePointer *ppMIF
);
}
[
object,
pointer_default(unique),
- pointer_default_top(unique),
uuid("00000136-0000-0000-C000-000000000046")
] interface ISCMActivator : IClassActivator
{
@@ -208,14 +197,13 @@ interface IRemUnknown2 : IRemUnknown
[
object,
pointer_default(unique),
- pointer_default_top(unique),
uuid("00020400-0000-0000-C000-000000000046")
] interface IDispatch : IUnknown
{
/*****************/
/* Function 0x03 */
WERROR GetTypeInfoCount(
- [out] uint16 *pctinfo);
+ [out, unique] uint16 *pctinfo);
typedef struct {
} REF_ITypeInfo;
@@ -225,16 +213,16 @@ interface IRemUnknown2 : IRemUnknown
WERROR GetTypeInfo (
[in] uint16 iTInfo,
[in] uint32 lcid,
- [out] REF_ITypeInfo *ppTInfo);
+ [out, unique] REF_ITypeInfo *ppTInfo);
/*****************/
/* Function 0x05 */
WERROR GetIDsOfNames(
- [in] GUID *riid,
+ [in, unique] GUID *riid,
/*FIXME[in,size_is(cNames)] OLESTR *rgszNames[], */
[in] uint16 cNames,
[in] uint32 lcid,
- [out,size_is(cNames)] uint32 *rgDispId);
+ [out,size_is(cNames), unique] uint32 *rgDispId);
typedef struct {
uint16 vartype;
@@ -254,13 +242,13 @@ interface IRemUnknown2 : IRemUnknown
/* Function 0x06 */
WERROR Invoke(
[in] uint32 dispIdMember,
- [in] GUID *riid,
+ [in, unique] GUID *riid,
[in] uint32 lcid,
[in] uint16 wFlags,
- [out,in] DISPPARAMS *pDispParams,
- [out] VARIANT *pVarResult,
- [out] EXCEPINFO *pExcepInfo,
- [out] uint16 *puArgErr);
+ [out,in, unique] DISPPARAMS *pDispParams,
+ [out, unique] VARIANT *pVarResult,
+ [out, unique] EXCEPINFO *pExcepInfo,
+ [out, unique] uint16 *puArgErr);
}
[
@@ -277,7 +265,6 @@ interface IRemUnknown2 : IRemUnknown
uuid(DA23F6DB-6F45-466C-9EED-0B65286F2D78),
helpstring("ICoffeeMachine Interface"),
pointer_default(unique),
- pointer_default_top(unique),
object
] interface ICoffeeMachine : IUnknown
{
@@ -295,7 +282,6 @@ interface IRemUnknown2 : IRemUnknown
[
object,
pointer_default(unique),
- pointer_default_top(unique),
uuid("0000000C-0000-0000-C000-000000000046"),
helpstring("Stream")
]
@@ -304,12 +290,12 @@ interface IStream : IUnknown
WERROR Read(
[out, size_is(num_requested), length_is(num_read)] uint8 pv[],
[in] uint32 num_requested,
- [in] uint32 *num_readx,
+ [in, unique] uint32 *num_readx,
[out] uint32 num_read
);
WERROR Write(
- [in,size_is(num_requested)] uint8 *data,
+ [in,size_is(num_requested),unique] uint8 *data,
[in] uint32 num_requested,
[out] uint32 num_written);
}
diff --git a/source4/librpc/idl/dnsserver.idl b/source4/librpc/idl/dnsserver.idl
index 9529763168..dca86d5820 100644
--- a/source4/librpc/idl/dnsserver.idl
+++ b/source4/librpc/idl/dnsserver.idl
@@ -7,7 +7,6 @@
[ uuid("50abc2a4-574d-40b3-9d66-ee4fd5fba076"),
version(5.0),
pointer_default(unique),
- pointer_default_top(unique),
helpstring("DNS Server")
] interface dnsserver
{
diff --git a/source4/librpc/idl/drsblobs.idl b/source4/librpc/idl/drsblobs.idl
index 311d8120de..8c8684969d 100644
--- a/source4/librpc/idl/drsblobs.idl
+++ b/source4/librpc/idl/drsblobs.idl
@@ -4,7 +4,6 @@
uuid("38578646-4566-4564-2244-275796345667"),
version(0.0),
pointer_default(unique),
- pointer_default_top(unique),
helpstring("Active Directory Replication LDAP Blobs"),
depends(drsuapi)
]
diff --git a/source4/librpc/idl/drsuapi.idl b/source4/librpc/idl/drsuapi.idl
index 60bd57cc52..075b97ce9c 100644
--- a/source4/librpc/idl/drsuapi.idl
+++ b/source4/librpc/idl/drsuapi.idl
@@ -7,7 +7,6 @@
authservice("ldap"),
helpstring("Active Directory Replication"),
pointer_default(unique),
- pointer_default_top(unique),
depends(security)
]
interface drsuapi
@@ -107,15 +106,15 @@ interface drsuapi
const string DRSUAPI_DS_BIND_GUID_W2K3 = "6afab99c-6e26-464a-975f-f58f105218bc";
WERROR drsuapi_DsBind(
- [in] GUID *bind_guid,
- [in,out] drsuapi_DsBindInfoCtr *bind_info,
- [out,ref] policy_handle *bind_handle
+ [in,unique] GUID *bind_guid,
+ [in,out,unique] drsuapi_DsBindInfoCtr *bind_info,
+ [out] policy_handle *bind_handle
);
/*****************/
/* Function 0x01 */
WERROR drsuapi_DsUnbind(
- [in,out,ref] policy_handle *bind_handle
+ [in,out] policy_handle *bind_handle
);
/*****************/
@@ -167,7 +166,7 @@ interface drsuapi
} drsuapi_DsReplicaSyncRequest;
WERROR drsuapi_DsReplicaSync(
- [in,ref] policy_handle *bind_handle,
+ [in] policy_handle *bind_handle,
[in] int32 level,
[in,switch_is(level)] drsuapi_DsReplicaSyncRequest req
);
@@ -697,7 +696,7 @@ interface drsuapi
} drsuapi_DsGetNCChangesCtr;
WERROR drsuapi_DsGetNCChanges(
- [in,ref] policy_handle *bind_handle,
+ [in] policy_handle *bind_handle,
[in,out] int32 level,
[in,switch_is(level)] drsuapi_DsGetNCChangesRequest req,
[out,switch_is(level)] drsuapi_DsGetNCChangesCtr ctr
@@ -725,7 +724,7 @@ interface drsuapi
} drsuapi_DsReplicaUpdateRefsRequest;
WERROR drsuapi_DsReplicaUpdateRefs(
- [in,ref] policy_handle *bind_handle,
+ [in] policy_handle *bind_handle,
[in] int32 level,
[in,switch_is(level)] drsuapi_DsReplicaUpdateRefsRequest req
);
@@ -844,7 +843,7 @@ interface drsuapi
} drsuapi_DsNameCtr;
WERROR drsuapi_DsCrackNames(
- [in,ref] policy_handle *bind_handle,
+ [in] policy_handle *bind_handle,
[in, out] int32 level,
[in,switch_is(level)] drsuapi_DsNameRequest req,
[out,switch_is(level)] drsuapi_DsNameCtr ctr
@@ -879,8 +878,8 @@ interface drsuapi
} drsuapi_DsWriteAccountSpnResult;
WERROR drsuapi_DsWriteAccountSpn(
- [in,ref] policy_handle *bind_handle,
- [in, out] int32 level,
+ [in] policy_handle *bind_handle,
+ [in,out] int32 level,
[in,switch_is(level)] drsuapi_DsWriteAccountSpnRequest req,
[out,switch_is(level)] drsuapi_DsWriteAccountSpnResult res
);
@@ -969,7 +968,7 @@ interface drsuapi
} drsuapi_DsGetDCInfoCtr;
WERROR drsuapi_DsGetDomainControllerInfo(
- [in,ref] policy_handle *bind_handle,
+ [in] policy_handle *bind_handle,
[in, out] int32 level,
[in,switch_is(level)] drsuapi_DsGetDCInfoRequest req,
[out,switch_is(level)] drsuapi_DsGetDCInfoCtr ctr
@@ -1075,7 +1074,7 @@ interface drsuapi
} drsuapi_DsAddEntryCtr;
WERROR drsuapi_DsAddEntry(
- [in,ref] policy_handle *bind_handle,
+ [in] policy_handle *bind_handle,
[in,out] int32 level,
[in,switch_is(level)] drsuapi_DsAddEntryRequest req,
[out,switch_is(level)] drsuapi_DsAddEntryCtr ctr
@@ -1355,7 +1354,7 @@ interface drsuapi
} drsuapi_DsReplicaInfo;
WERROR drsuapi_DsReplicaGetInfo(
- [in,ref] policy_handle *bind_handle,
+ [in] policy_handle *bind_handle,
[in] drsuapi_DsReplicaGetInfoLevel level,
[in,switch_is(level)] drsuapi_DsReplicaGetInfoRequest req,
[out] drsuapi_DsReplicaInfoType info_type,
diff --git a/source4/librpc/idl/dsbackup.idl b/source4/librpc/idl/dsbackup.idl
index 5ba5ffe959..21dca8fa0e 100644
--- a/source4/librpc/idl/dsbackup.idl
+++ b/source4/librpc/idl/dsbackup.idl
@@ -2,7 +2,6 @@
uuid("ecec0d70-a603-11d0-96b1-00a0c91ece30"),
version(1.0),
pointer_default(unique),
- pointer_default_top(unique),
helpstring("Backup support for Active Directory")
] interface ad_backup
{
diff --git a/source4/librpc/idl/dssetup.idl b/source4/librpc/idl/dssetup.idl
index f10027466b..3ae9986fde 100644
--- a/source4/librpc/idl/dssetup.idl
+++ b/source4/librpc/idl/dssetup.idl
@@ -9,7 +9,6 @@
version(0.0),
endpoint("ncacn_np:[\\pipe\\lsarpc]", "ncacn_np:[\\pipe\\lsass]", "ncacn_ip_tcp:", "ncalrpc:"),
pointer_default(unique),
- pointer_default_top(unique),
helpstring("Active Directory Setup")
] interface dssetup
{
@@ -81,7 +80,7 @@
WERROR dssetup_DsRoleGetPrimaryDomainInformation(
[in] dssetup_DsRoleInfoLevel level,
- [out,switch_is(level)] dssetup_DsRoleInfo *info
+ [out,switch_is(level),unique] dssetup_DsRoleInfo *info
);
/*
diff --git a/source4/librpc/idl/eventlog.idl b/source4/librpc/idl/eventlog.idl
index f2083a0c63..38f4a88e28 100644
--- a/source4/librpc/idl/eventlog.idl
+++ b/source4/librpc/idl/eventlog.idl
@@ -7,7 +7,6 @@
version(0.0),
depends(lsa,security),
pointer_default(unique),
- pointer_default_top(unique),
helpstring("Event Logger")
] interface eventlog
{
@@ -58,8 +57,8 @@
/******************/
/* Function: 0x00 */
NTSTATUS eventlog_ClearEventLogW(
- [in,ref] policy_handle *handle,
- [in] lsa_String *unknown
+ [in] policy_handle *handle,
+ [in,unique] lsa_String *unknown
);
/******************/
@@ -69,7 +68,7 @@
/******************/
/* Function: 0x02 */
NTSTATUS eventlog_CloseEventLog(
- [in,out,ref] policy_handle *handle
+ [in,out] policy_handle *handle
);
/******************/
@@ -79,7 +78,7 @@
/******************/
/* Function: 0x04 */
NTSTATUS eventlog_GetNumRecords(
- [in,ref] policy_handle *handle,
+ [in] policy_handle *handle,
[out] uint32 number
);
@@ -94,12 +93,12 @@
/******************/
/* Function: 0x07 */
NTSTATUS eventlog_OpenEventLogW(
- [in] eventlog_OpenUnknown0 *unknown0,
+ [in,unique] eventlog_OpenUnknown0 *unknown0,
[in] lsa_String logname,
[in] lsa_String servername,
[in] uint32 unknown2,
[in] uint32 unknown3,
- [out,ref] policy_handle *handle
+ [out] policy_handle *handle
);
/******************/
@@ -113,11 +112,11 @@
/******************/
/* Function: 0x0a */
NTSTATUS eventlog_ReadEventLogW(
- [in,ref] policy_handle *handle,
+ [in] policy_handle *handle,
[in] uint32 flags,
[in] uint32 offset,
[in] uint32 number_of_bytes,
- [out,ref,size_is(number_of_bytes)] uint8 *data,
+ [out,size_is(number_of_bytes)] uint8 *data,
[out] uint32 sent_size,
[out] uint32 real_size
);
@@ -173,6 +172,6 @@
/*****************/
/* Function 0x17 */
NTSTATUS eventlog_FlushEventLog(
- [in,ref] policy_handle *handle
+ [in] policy_handle *handle
);
}
diff --git a/source4/librpc/idl/exchange.idl b/source4/librpc/idl/exchange.idl
index f8af3c77c6..f5e1a0c955 100644
--- a/source4/librpc/idl/exchange.idl
+++ b/source4/librpc/idl/exchange.idl
@@ -192,7 +192,6 @@ System Attendant Private Interface
[
uuid("a4f1db00-ca47-1067-b31f-00dd010662da"),
pointer_default(unique),
- pointer_default_top(unique),
version(0.81),
helpstring("Exchange 5.5 EMSMDB")
] interface exchange_emsmdb
@@ -214,9 +213,9 @@ System Attendant Private Interface
} EcDoRpcBlob;
void EcDoRpc(
- [in,out,ref] policy_handle *handle,
+ [in,out] policy_handle *handle,
[in,out] EcDoRpcBlob data,
- [in,out,ref] uint16 *length,
+ [in,out] uint16 *length,
[in] uint16 size
);
diff --git a/source4/librpc/idl/initshutdown.idl b/source4/librpc/idl/initshutdown.idl
index f576061565..50d49637c2 100644
--- a/source4/librpc/idl/initshutdown.idl
+++ b/source4/librpc/idl/initshutdown.idl
@@ -9,7 +9,6 @@
version(1.0),
endpoint("ncacn_np:[\\pipe\\InitShutdown]"),
pointer_default(unique),
- pointer_default_top(unique),
helpstring("Init shutdown service")
] interface initshutdown
{
@@ -25,20 +24,20 @@
} initshutdown_String;
WERROR initshutdown_Init(
- [in] uint16 *hostname,
- [in] initshutdown_String *message,
+ [in,unique] uint16 *hostname,
+ [in,unique] initshutdown_String *message,
[in] uint32 timeout,
[in] uint8 force_apps,
[in] uint8 reboot
);
WERROR initshutdown_Abort(
- [in] uint16 *server
+ [in,unique] uint16 *server
);
WERROR initshutdown_InitEx(
- [in] uint16 *hostname,
- [in] initshutdown_String *message,
+ [in,unique] uint16 *hostname,
+ [in,unique] initshutdown_String *message,
[in] uint32 timeout,
[in] uint8 force_apps,
[in] uint8 reboot,
diff --git a/source4/librpc/idl/irpc.idl b/source4/librpc/idl/irpc.idl
index 34998d57a7..8c14982fbf 100644
--- a/source4/librpc/idl/irpc.idl
+++ b/source4/librpc/idl/irpc.idl
@@ -6,7 +6,6 @@
[ uuid("e770c620-0b06-4b5e-8d87-a26e20f28340"),
version(1.0),
pointer_default(unique),
- pointer_default_top(unique),
depends(security)
] interface irpc
{
@@ -58,8 +57,8 @@
[in] astring my_computername,
[in] astring my_accountname,
[in] uint32 account_control,
- [in,ref] dom_sid *domain_sid,
- [out] astring *dcname
+ [in] dom_sid *domain_sid,
+ [out,unique] astring *dcname
);
/******************************************************
diff --git a/source4/librpc/idl/krb5pac.idl b/source4/librpc/idl/krb5pac.idl
index 35d625d926..dd3eedc7a7 100644
--- a/source4/librpc/idl/krb5pac.idl
+++ b/source4/librpc/idl/krb5pac.idl
@@ -8,7 +8,6 @@
uuid("1-2-3-4"),
version(0.0),
pointer_default(unique),
- pointer_default_top(unique),
depends(security,netlogon)
]
interface krb5pac
diff --git a/source4/librpc/idl/lsa.idl b/source4/librpc/idl/lsa.idl
index 0927e6ef85..3dbb12fc71 100644
--- a/source4/librpc/idl/lsa.idl
+++ b/source4/librpc/idl/lsa.idl
@@ -8,7 +8,6 @@
version(0.0),
endpoint("ncacn_np:[\\pipe\\lsarpc]","ncacn_np:[\\pipe\\lsass]", "ncacn_ip_tcp:", "ncalrpc:"),
pointer_default(unique),
- pointer_default_top(unique),
helpstring("Local Security Authority"),
depends(security)
] interface lsarpc
@@ -41,14 +40,14 @@
/******************/
/* Function: 0x00 */
NTSTATUS lsa_Close (
- [in,out,ref] policy_handle *handle
+ [in,out] policy_handle *handle
);
/******************/
/* Function: 0x01 */
NTSTATUS lsa_Delete (
- [in,ref] policy_handle *handle
+ [in] policy_handle *handle
);
@@ -70,19 +69,19 @@
} lsa_PrivArray;
NTSTATUS lsa_EnumPrivs (
- [in,ref] policy_handle *handle,
- [in,out,ref] uint32 *resume_handle,
+ [in] policy_handle *handle,
+ [in,out] uint32 *resume_handle,
[in] uint32 max_count,
- [out,ref] lsa_PrivArray *privs
+ [out] lsa_PrivArray *privs
);
/******************/
/* Function: 0x03 */
NTSTATUS lsa_QuerySecurity (
- [in,ref] policy_handle *handle,
+ [in] policy_handle *handle,
[in] security_secinfo sec_info,
- [out] sec_desc_buf *sdbuf
+ [out,unique] sec_desc_buf *sdbuf
);
@@ -117,10 +116,10 @@
/* notice the screwup with the system_name - thats why MS created
OpenPolicy2 */
NTSTATUS lsa_OpenPolicy (
- [in] uint16 *system_name,
- [in,ref] lsa_ObjectAttribute *attr,
+ [in,unique] uint16 *system_name,
+ [in] lsa_ObjectAttribute *attr,
[in] uint32 access_mask,
- [out,ref] policy_handle *handle
+ [out] policy_handle *handle
);
@@ -232,9 +231,9 @@
} lsa_PolicyInformation;
NTSTATUS lsa_QueryInfoPolicy (
- [in,ref] policy_handle *handle,
- [in] uint16 level,
- [out,switch_is(level)] lsa_PolicyInformation *info
+ [in] policy_handle *handle,
+ [in] uint16 level,
+ [out,unique,switch_is(level)] lsa_PolicyInformation *info
);
/******************/
@@ -248,10 +247,10 @@
/******************/
/* Function: 0x0a */
NTSTATUS lsa_CreateAccount (
- [in,ref] policy_handle *handle,
- [in,ref] dom_sid2 *sid,
- [in] uint32 access_mask,
- [out,ref] policy_handle *acct_handle
+ [in] policy_handle *handle,
+ [in] dom_sid2 *sid,
+ [in] uint32 access_mask,
+ [out] policy_handle *acct_handle
);
/******************/
@@ -269,10 +268,10 @@
} lsa_SidArray;
NTSTATUS lsa_EnumAccounts (
- [in,ref] policy_handle *handle,
- [in,out,ref] uint32 *resume_handle,
+ [in] policy_handle *handle,
+ [in,out] uint32 *resume_handle,
[in,range(0,8192)] uint32 num_entries,
- [out,ref] lsa_SidArray *sids
+ [out] lsa_SidArray *sids
);
@@ -285,10 +284,10 @@
} lsa_TrustInformation;
NTSTATUS lsa_CreateTrustedDomain(
- [in,ref] policy_handle *handle,
- [in,ref] lsa_TrustInformation *info,
+ [in] policy_handle *handle,
+ [in] lsa_TrustInformation *info,
[in] uint32 access_mask,
- [out,ref] policy_handle *trustdom_handle
+ [out] policy_handle *trustdom_handle
);
@@ -309,10 +308,10 @@
} lsa_DomainList;
NTSTATUS lsa_EnumTrustDom (
- [in,ref] policy_handle *handle,
- [in,out,ref] uint32 *resume_handle,
+ [in] policy_handle *handle,
+ [in,out] uint32 *resume_handle,
[in,range(0,1000)] uint32 max_size,
- [out,ref] lsa_DomainList *domains
+ [out] lsa_DomainList *domains
);
@@ -348,13 +347,13 @@
} lsa_RefDomainList;
NTSTATUS lsa_LookupNames (
- [in,ref] policy_handle *handle,
+ [in] policy_handle *handle,
[in,range(0,1000)] uint32 num_names,
[in,size_is(num_names)] lsa_String names[],
- [out] lsa_RefDomainList *domains,
- [in,out,ref] lsa_TransSidArray *sids,
+ [out,unique] lsa_RefDomainList *domains,
+ [in,out] lsa_TransSidArray *sids,
[in] uint16 level,
- [in,out,ref] uint32 *count
+ [in,out] uint32 *count
);
@@ -373,31 +372,31 @@
} lsa_TransNameArray;
NTSTATUS lsa_LookupSids (
- [in,ref] policy_handle *handle,
- [in,ref] lsa_SidArray *sids,
- [out] lsa_RefDomainList *domains,
- [in,out,ref] lsa_TransNameArray *names,
+ [in] policy_handle *handle,
+ [in] lsa_SidArray *sids,
+ [out,unique] lsa_RefDomainList *domains,
+ [in,out] lsa_TransNameArray *names,
[in] uint16 level,
- [in,out,ref] uint32 *count
+ [in,out] uint32 *count
);
/* Function: 0x10 */
NTSTATUS lsa_CreateSecret(
- [in,ref] policy_handle *handle,
+ [in] policy_handle *handle,
[in] lsa_String name,
[in] uint32 access_mask,
- [out,ref] policy_handle *sec_handle
+ [out] policy_handle *sec_handle
);
/*****************************************/
/* Function: 0x11 */
NTSTATUS lsa_OpenAccount (
- [in,ref] policy_handle *handle,
- [in,ref] dom_sid2 *sid,
+ [in] policy_handle *handle,
+ [in] dom_sid2 *sid,
[in] uint32 access_mask,
- [out,ref] policy_handle *acct_handle
+ [out] policy_handle *acct_handle
);
@@ -416,25 +415,25 @@
} lsa_PrivilegeSet;
NTSTATUS lsa_EnumPrivsAccount (
- [in,ref] policy_handle *handle,
- [out] lsa_PrivilegeSet *privs
+ [in] policy_handle *handle,
+ [out,unique] lsa_PrivilegeSet *privs
);
/****************************************/
/* Function: 0x13 */
NTSTATUS lsa_AddPrivilegesToAccount(
- [in,ref] policy_handle *handle,
- [in,ref] lsa_PrivilegeSet *privs
+ [in] policy_handle *handle,
+ [in] lsa_PrivilegeSet *privs
);
/****************************************/
/* Function: 0x14 */
NTSTATUS lsa_RemovePrivilegesFromAccount(
- [in,ref] policy_handle *handle,
+ [in] policy_handle *handle,
[in] uint8 remove_all,
- [in] lsa_PrivilegeSet *privs
+ [in,unique] lsa_PrivilegeSet *privs
);
/* Function: 0x15 */
@@ -450,10 +449,10 @@
/* Function: 0x19 */
NTSTATUS lsa_OpenTrustedDomain(
- [in,ref] policy_handle *handle,
- [in,ref] dom_sid2 *sid,
+ [in] policy_handle *handle,
+ [in] dom_sid2 *sid,
[in] uint32 access_mask,
- [out,ref] policy_handle *trustdom_handle
+ [out] policy_handle *trustdom_handle
);
typedef [flag(NDR_PAHEX)] struct {
@@ -554,9 +553,9 @@
/* Function: 0x1a */
NTSTATUS lsa_QueryTrustedDomainInfo(
- [in,ref] policy_handle *trustdom_handle,
- [in] lsa_TrustDomInfoEnum level,
- [out,switch_is(level)] lsa_TrustedDomainInfo *info
+ [in] policy_handle *trustdom_handle,
+ [in] lsa_TrustDomInfoEnum level,
+ [out,switch_is(level),unique] lsa_TrustedDomainInfo *info
);
/* Function: 0x1b */
@@ -564,18 +563,18 @@
/* Function: 0x1c */
NTSTATUS lsa_OpenSecret(
- [in,ref] policy_handle *handle,
+ [in] policy_handle *handle,
[in] lsa_String name,
[in] uint32 access_mask,
- [out,ref] policy_handle *sec_handle
+ [out] policy_handle *sec_handle
);
/* Function: 0x1d */
NTSTATUS lsa_SetSecret(
- [in,ref] policy_handle *sec_handle,
- [in] lsa_DATA_BUF *new_val,
- [in] lsa_DATA_BUF *old_val
+ [in] policy_handle *sec_handle,
+ [in,unique] lsa_DATA_BUF *new_val,
+ [in,unique] lsa_DATA_BUF *old_val
);
typedef struct {
@@ -584,38 +583,38 @@
/* Function: 0x1e */
NTSTATUS lsa_QuerySecret (
- [in,ref] policy_handle *sec_handle,
- [in,out] lsa_DATA_BUF_PTR *new_val,
- [in,out] NTTIME_hyper *new_mtime,
- [in,out] lsa_DATA_BUF_PTR *old_val,
- [in,out] NTTIME_hyper *old_mtime
+ [in] policy_handle *sec_handle,
+ [in,out,unique] lsa_DATA_BUF_PTR *new_val,
+ [in,out,unique] NTTIME_hyper *new_mtime,
+ [in,out,unique] lsa_DATA_BUF_PTR *old_val,
+ [in,out,unique] NTTIME_hyper *old_mtime
);
/* Function: 0x1f */
NTSTATUS lsa_LookupPrivValue(
- [in,ref] policy_handle *handle,
- [in,ref] lsa_String *name,
- [out,ref] lsa_LUID *luid
+ [in] policy_handle *handle,
+ [in] lsa_String *name,
+ [out] lsa_LUID *luid
);
/* Function: 0x20 */
NTSTATUS lsa_LookupPrivName (
- [in,ref] policy_handle *handle,
- [in,ref] lsa_LUID *luid,
- [out] lsa_String *name
+ [in] policy_handle *handle,
+ [in] lsa_LUID *luid,
+ [out,unique] lsa_String *name
);
/*******************/
/* Function: 0x21 */
NTSTATUS lsa_LookupPrivDisplayName (
- [in,ref] policy_handle *handle,
- [in,ref] lsa_String *name,
- [out] lsa_String *disp_name,
+ [in] policy_handle *handle,
+ [in] lsa_String *name,
+ [out,unique] lsa_String *disp_name,
/* see http://www.microsoft.com/globaldev/nlsweb/ for
language definitions */
- [in,out,ref] uint16 *language_id,
+ [in,out] uint16 *language_id,
[in] uint16 unknown
);
@@ -626,9 +625,9 @@
/*******************/
/* Function: 0x23 */
NTSTATUS lsa_EnumAccountsWithUserRight (
- [in,ref] policy_handle *handle,
- [in] lsa_String *name,
- [out,ref] lsa_SidArray *sids
+ [in] policy_handle *handle,
+ [in,unique] lsa_String *name,
+ [out] lsa_SidArray *sids
);
/* Function: 0x24 */
@@ -642,35 +641,35 @@
} lsa_RightSet;
NTSTATUS lsa_EnumAccountRights (
- [in,ref] policy_handle *handle,
- [in,ref] dom_sid2 *sid,
- [out,ref] lsa_RightSet *rights
+ [in] policy_handle *handle,
+ [in] dom_sid2 *sid,
+ [out] lsa_RightSet *rights
);
/**********************/
/* Function: 0x25 */
NTSTATUS lsa_AddAccountRights (
- [in,ref] policy_handle *handle,
- [in,ref] dom_sid2 *sid,
- [in,ref] lsa_RightSet *rights
+ [in] policy_handle *handle,
+ [in] dom_sid2 *sid,
+ [in] lsa_RightSet *rights
);
/**********************/
/* Function: 0x26 */
NTSTATUS lsa_RemoveAccountRights (
- [in,ref] policy_handle *handle,
- [in,ref] dom_sid2 *sid,
+ [in] policy_handle *handle,
+ [in] dom_sid2 *sid,
[in] uint32 unknown,
- [in,ref] lsa_RightSet *rights
+ [in] lsa_RightSet *rights
);
/* Function: 0x27 */
NTSTATUS lsa_QueryTrustedDomainInfoBySid(
- [in,ref] policy_handle *handle,
- [in,ref] dom_sid2 *dom_sid,
+ [in] policy_handle *handle,
+ [in] dom_sid2 *dom_sid,
[in] lsa_TrustDomInfoEnum level,
- [out,switch_is(level)] lsa_TrustedDomainInfo *info
+ [out,switch_is(level),unique] lsa_TrustedDomainInfo *info
);
/* Function: 0x28 */
@@ -686,10 +685,10 @@
/**********************/
/* Function: 0x2c */
NTSTATUS lsa_OpenPolicy2 (
- [in] unistr *system_name,
- [in,ref] lsa_ObjectAttribute *attr,
+ [in,unique] unistr *system_name,
+ [in] lsa_ObjectAttribute *attr,
[in] uint32 access_mask,
- [out,ref] policy_handle *handle
+ [out] policy_handle *handle
);
/**********************/
@@ -699,18 +698,18 @@
} lsa_StringPointer;
NTSTATUS lsa_GetUserName(
- [in] unistr *system_name,
- [in,out] lsa_String *account_name,
- [in,out] lsa_StringPointer *authority_name
+ [in,unique] unistr *system_name,
+ [in,out,unique] lsa_String *account_name,
+ [in,out,unique] lsa_StringPointer *authority_name
);
/**********************/
/* Function: 0x2e */
NTSTATUS lsa_QueryInfoPolicy2(
- [in,ref] policy_handle *handle,
+ [in] policy_handle *handle,
[in] uint16 level,
- [out,switch_is(level)] lsa_PolicyInformation *info
+ [out,unique,switch_is(level)] lsa_PolicyInformation *info
);
/* Function 0x2f */
@@ -719,10 +718,10 @@
/**********************/
/* Function 0x30 */
NTSTATUS lsa_QueryTrustedDomainInfoByName(
- [in,ref] policy_handle *handle,
+ [in] policy_handle *handle,
[in] lsa_String trusted_domain,
[in] lsa_TrustDomInfoEnum level,
- [out,switch_is(level)] lsa_TrustedDomainInfo *info
+ [out,unique,switch_is(level)] lsa_TrustedDomainInfo *info
);
/* Function 0x31 */
@@ -766,25 +765,25 @@
} lsa_DomainInformationPolicy;
NTSTATUS lsa_QueryDomainInformationPolicy(
- [in,ref] policy_handle *handle,
+ [in] policy_handle *handle,
[in] uint16 level,
- [out,switch_is(level)] lsa_DomainInformationPolicy *info
+ [out,unique,switch_is(level)] lsa_DomainInformationPolicy *info
);
/* Function 0x36 */
NTSTATUS lsa_SetDomainInformationPolicy(
- [in,ref] policy_handle *handle,
+ [in] policy_handle *handle,
[in] uint16 level,
- [in,switch_is(level)] lsa_DomainInformationPolicy *info
+ [in,unique,switch_is(level)] lsa_DomainInformationPolicy *info
);
/**********************/
/* Function 0x37 */
NTSTATUS lsa_OpenTrustedDomainByName(
- [in,ref] policy_handle *handle,
+ [in] policy_handle *handle,
[in] lsa_String name,
[in] uint32 access_mask,
- [out,ref] policy_handle *trustdom_handle
+ [out] policy_handle *trustdom_handle
);
/* Function 0x38 */
@@ -806,12 +805,12 @@
} lsa_TransNameArray2;
NTSTATUS lsa_LookupSids2(
- [in,ref] policy_handle *handle,
- [in,ref] lsa_SidArray *sids,
- [out] lsa_RefDomainList *domains,
- [in,out,ref] lsa_TransNameArray2 *names,
+ [in] policy_handle *handle,
+ [in] lsa_SidArray *sids,
+ [out,unique] lsa_RefDomainList *domains,
+ [in,out] lsa_TransNameArray2 *names,
[in] uint16 level,
- [in,out,ref] uint32 *count,
+ [in,out] uint32 *count,
[in] uint32 unknown1,
[in] uint32 unknown2
);
@@ -832,13 +831,13 @@
} lsa_TransSidArray2;
NTSTATUS lsa_LookupNames2 (
- [in,ref] policy_handle *handle,
+ [in] policy_handle *handle,
[in,range(0,1000)] uint32 num_names,
[in,size_is(num_names)] lsa_String names[],
- [out] lsa_RefDomainList *domains,
- [in,out,ref] lsa_TransSidArray2 *sids,
+ [out,unique] lsa_RefDomainList *domains,
+ [in,out] lsa_TransSidArray2 *sids,
[in] uint16 level,
- [in,out,ref] uint32 *count,
+ [in,out] uint32 *count,
[in] uint32 unknown1,
[in] uint32 unknown2
);
@@ -885,13 +884,13 @@
} lsa_TransSidArray3;
NTSTATUS lsa_LookupNames3 (
- [in,ref] policy_handle *handle,
+ [in] policy_handle *handle,
[in,range(0,1000)] uint32 num_names,
[in,size_is(num_names)] lsa_String names[],
- [out] lsa_RefDomainList *domains,
- [in,out,ref] lsa_TransSidArray3 *sids,
+ [out,unique] lsa_RefDomainList *domains,
+ [in,out] lsa_TransSidArray3 *sids,
[in] uint16 level,
- [in,out,ref] uint32 *count,
+ [in,out] uint32 *count,
[in] uint32 unknown1,
[in] uint32 unknown2
);
@@ -921,11 +920,11 @@
/* Function 0x4c */
NTSTATUS lsa_LookupSids3(
- [in,ref] lsa_SidArray *sids,
- [out] lsa_RefDomainList *domains,
- [in,out,ref] lsa_TransNameArray2 *names,
+ [in] lsa_SidArray *sids,
+ [out,unique] lsa_RefDomainList *domains,
+ [in,out] lsa_TransNameArray2 *names,
[in] uint16 level,
- [in,out,ref] uint32 *count,
+ [in,out] uint32 *count,
[in] uint32 unknown1,
[in] uint32 unknown2
);
diff --git a/source4/librpc/idl/mgmt.idl b/source4/librpc/idl/mgmt.idl
index 2c4910e677..8329c8e55f 100644
--- a/source4/librpc/idl/mgmt.idl
+++ b/source4/librpc/idl/mgmt.idl
@@ -8,7 +8,6 @@
uuid("afa8bd80-7d8a-11c9-bef4-08002b102989"),
version(1.0),
pointer_default(unique),
- pointer_default_top(unique),
endpoint("ncalrpc:[EPMAPPER]", "ncacn_ip_tcp:[135]", "ncacn_np:[\\pipe\\epmapper]"),
helpstring("DCE/RPC Remote Management")
]
@@ -27,7 +26,7 @@ interface mgmt
/***********************/
/* Function 0x00 */
WERROR mgmt_inq_if_ids (
- [out] rpc_if_id_vector_t *if_id_vector
+ [out,unique] rpc_if_id_vector_t *if_id_vector
);