r18639: Get rid of the keepref support

(This used to be commit d1364ef0cd8f1a64f44476476323ab390ac4de48)

23 files changed, 48 insertions, 78 deletions

diff --git a/source4/librpc/idl/dcom.idl b/source4/librpc/idl/dcom.idl
index 13bdde5aa8..c089cd3c92 100644
--- a/source4/librpc/idl/dcom.idl
+++ b/source4/librpc/idl/dcom.idl
@@ -18,8 +18,7 @@
 	object,
 	uuid("00000000-0000-0000-C000-000000000046"),
 	pointer_default(unique),
-	helpstring("Base interface for all COM interfaces"),
-	keepref
+	helpstring("Base interface for all COM interfaces")
 ]
 interface IUnknown
 {
@@ -43,8 +42,7 @@ interface IUnknown
 [
 	object,
 	uuid("00000001-0000-0000-C000-000000000046"),
-	pointer_default(unique),
-	keepref
+	pointer_default(unique)
 ] interface IClassFactory : IUnknown
 {
 	[local] WERROR CreateInstance([in,unique] MInterfacePointer *pUnknown, 
@@ -71,8 +69,7 @@ interface IUnknown
 	uuid("00000131-0000-0000-C000-000000000046"),
 	object,
 	pointer_default(unique),
-	helpstring("Remote version of IUnknown"),
-	keepref
+	helpstring("Remote version of IUnknown")
 ]
 interface IRemUnknown : IUnknown
 {
@@ -172,8 +169,7 @@ interface IRemUnknown : IUnknown
 [
 	object,
 	pointer_default(unique),
-	uuid("00000143-0000-0000-C000-000000000046"),
-	keepref
+	uuid("00000143-0000-0000-C000-000000000046")
 ]
 
 interface IRemUnknown2 : IRemUnknown
@@ -190,8 +186,7 @@ interface IRemUnknown2 : IRemUnknown
 [
 	object,
 	pointer_default(unique),
-	uuid("00020400-0000-0000-C000-000000000046"),
-	keepref
+	uuid("00020400-0000-0000-C000-000000000046")
 ] interface IDispatch : IUnknown
 {
 	/*****************/
@@ -259,8 +254,7 @@ interface IRemUnknown2 : IRemUnknown
 	uuid(DA23F6DB-6F45-466C-9EED-0B65286F2D78),
 	helpstring("ICoffeeMachine Interface"),
 	pointer_default(unique),
-	object,
-	keepref
+	object
 ] interface ICoffeeMachine : IUnknown
 {
 	WERROR MakeCoffee([in,string,charset(UTF16)] uint16 *flavor);
@@ -278,8 +272,7 @@ interface IRemUnknown2 : IRemUnknown
 	object,
 	pointer_default(unique),
 	uuid("0000000C-0000-0000-C000-000000000046"),
-	helpstring("Stream"),
-	keepref
+	helpstring("Stream")
 ]
 interface IStream : IUnknown
 {
diff --git a/source4/librpc/idl/dfs.idl b/source4/librpc/idl/dfs.idl
index 42d79d0c81..c79f77cce3 100644
--- a/source4/librpc/idl/dfs.idl
+++ b/source4/librpc/idl/dfs.idl
@@ -5,8 +5,7 @@
 [ uuid("4fc742e0-4a10-11cf-8273-00aa004ae673"),
   version(3.0),
   pointer_default(unique),
-  helpstring("Settings for Microsoft Distributed File System"),
-  keepref
+  helpstring("Settings for Microsoft Distributed File System")
 ] interface netdfs
 {
 	/******************/
diff --git a/source4/librpc/idl/drsuapi.idl b/source4/librpc/idl/drsuapi.idl
index f77a5496a0..aa87676c9d 100644
--- a/source4/librpc/idl/drsuapi.idl
+++ b/source4/librpc/idl/drsuapi.idl
@@ -7,8 +7,7 @@
   authservice("ldap"),
   helpstring("Active Directory Replication"),
   pointer_default(unique),
-  depends(security,misc,samr),
-  keepref
+  depends(security,misc,samr)
 ] 
 interface drsuapi
 {
diff --git a/source4/librpc/idl/echo.idl b/source4/librpc/idl/echo.idl
index 80123f9922..fa030be761 100644
--- a/source4/librpc/idl/echo.idl
+++ b/source4/librpc/idl/echo.idl
@@ -4,8 +4,7 @@
   endpoint("ncacn_np:[\\pipe\\rpcecho]", "ncacn_ip_tcp:", "ncalrpc:"),
   pointer_default(unique),
   version(1.0),
-  helpstring("Simple echo pipe"),
-  keepref
+  helpstring("Simple echo pipe")
 ]
 interface rpcecho
 {
diff --git a/source4/librpc/idl/epmapper.idl b/source4/librpc/idl/epmapper.idl
index e913209cf1..223883c366 100644
--- a/source4/librpc/idl/epmapper.idl
+++ b/source4/librpc/idl/epmapper.idl
@@ -15,8 +15,7 @@ http://www.opengroup.org/onlinepubs/9629399/chap6.htm#tagcjh_11_02_03_01: bindin
 		  "ncalrpc:[EPMAPPER]"),
  helpstring("EndPoint Mapper"),
  pointer_default_top(sptr),
- pointer_default(sptr),
- keepref
+ pointer_default(sptr)
 ]
 interface epmapper
 {
diff --git a/source4/librpc/idl/eventlog.idl b/source4/librpc/idl/eventlog.idl
index c8a146b272..38f4a88e28 100644
--- a/source4/librpc/idl/eventlog.idl
+++ b/source4/librpc/idl/eventlog.idl
@@ -7,8 +7,7 @@
   version(0.0),
   depends(lsa,security),
   pointer_default(unique),
-  helpstring("Event Logger"),
-  keepref
+  helpstring("Event Logger")
 ] interface eventlog
 {
 	typedef bitmap {
diff --git a/source4/librpc/idl/frsapi.idl b/source4/librpc/idl/frsapi.idl
index 579be8c3a6..2c3f3bb9ff 100644
--- a/source4/librpc/idl/frsapi.idl
+++ b/source4/librpc/idl/frsapi.idl
@@ -3,8 +3,7 @@
   version(1.1),
   endpoint("ncacn_ip_tcp:", "ncalrpc:"),
   helpstring("File Replication API"),
-  pointer_default(unique),
-  keepref
+  pointer_default(unique)
 ] 
 interface frsapi
 {
diff --git a/source4/librpc/idl/frsrpc.idl b/source4/librpc/idl/frsrpc.idl
index 3fe5e6db22..434c5d490d 100644
--- a/source4/librpc/idl/frsrpc.idl
+++ b/source4/librpc/idl/frsrpc.idl
@@ -3,8 +3,7 @@
   version(1.1),
   endpoint("ncacn_ip_tcp:", "ncalrpc:"),
   helpstring("File Replication Service"),
-  pointer_default(unique),
-  keepref
+  pointer_default(unique)
 ] 
 interface frsrpc
 {
diff --git a/source4/librpc/idl/initshutdown.idl b/source4/librpc/idl/initshutdown.idl
index 8555ed0c5c..50d49637c2 100644
--- a/source4/librpc/idl/initshutdown.idl
+++ b/source4/librpc/idl/initshutdown.idl
@@ -9,8 +9,7 @@
   version(1.0),
   endpoint("ncacn_np:[\\pipe\\InitShutdown]"),
   pointer_default(unique),
-  helpstring("Init shutdown service"),
-  keepref
+  helpstring("Init shutdown service")
 ] interface initshutdown
 {
 	typedef struct {
diff --git a/source4/librpc/idl/irpc.idl b/source4/librpc/idl/irpc.idl
index a566a99bfc..5614608bd7 100644
--- a/source4/librpc/idl/irpc.idl
+++ b/source4/librpc/idl/irpc.idl
@@ -6,8 +6,7 @@
 [ uuid("e770c620-0b06-4b5e-8d87-a26e20f28340"),
   version(1.0),
   pointer_default(unique),
-  depends(security,nbt),
-  keepref
+  depends(security,nbt)
 ] interface irpc
 {
 	typedef bitmap {
diff --git a/source4/librpc/idl/lsa.idl b/source4/librpc/idl/lsa.idl
index f78c36ec59..1e941e6f3b 100644
--- a/source4/librpc/idl/lsa.idl
+++ b/source4/librpc/idl/lsa.idl
@@ -9,8 +9,7 @@
   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),
-  keepref
+  depends(security)
 ] interface lsarpc
 {
 	declare bitmap security_secinfo;
diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl
index e406d51329..ffceab002d 100644
--- a/source4/librpc/idl/netlogon.idl
+++ b/source4/librpc/idl/netlogon.idl
@@ -12,8 +12,7 @@
   endpoint("ncacn_np:[\\pipe\\netlogon]","ncacn_ip_tcp:","ncalrpc:"),
   pointer_default(unique),
   pointer_default_top(unique),
-  depends(lsa,samr,security),
-  keepref
+  depends(lsa,samr,security)
 ]
 
 interface netlogon
diff --git a/source4/librpc/idl/orpc.idl b/source4/librpc/idl/orpc.idl
index c59cc9d3cb..c1faefd3b1 100644
--- a/source4/librpc/idl/orpc.idl
+++ b/source4/librpc/idl/orpc.idl
@@ -6,8 +6,7 @@
  */
 
 [
-	pointer_default(unique),
-	keepref
+	pointer_default(unique)
 ]
 interface ObjectRpcBaseTypes
 {
diff --git a/source4/librpc/idl/oxidresolver.idl b/source4/librpc/idl/oxidresolver.idl
index beeb6a7f4f..12c5947265 100644
--- a/source4/librpc/idl/oxidresolver.idl
+++ b/source4/librpc/idl/oxidresolver.idl
@@ -16,8 +16,7 @@
 	endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]", "ncalrpc:"),
 	pointer_default(unique),
   	pointer_default_top(unique),
-	depends(dcom, orpc),
-	keepref
+	depends(dcom, orpc)
 ]
 interface IOXIDResolver
 {
@@ -34,8 +33,8 @@ interface IOXIDResolver
 		 [in] uint16 cRequestedProtseqs,
 		 [in, size_is(cRequestedProtseqs)] uint16 arRequestedProtseqs[],
 		 [out] DUALSTRINGARRAY *ppdsaOxidBindings,
-		 [out] IPID pipidRemUnknown,
-		 [out] uint32 pAuthnHint
+		 [out,ref] IPID *pipidRemUnknown,
+		 [out,ref] uint32 *pAuthnHint
 			 );
 
 	/* Simple ping is used to ping a Set. Client machines use this */
@@ -51,8 +50,7 @@ interface IOXIDResolver
 	/* whole set can subsequently be pinged using SimplePing, */
 	/* thus reducing network traffic. */
 	[idempotent] WERROR ComplexPing (
-		[in] SETID *SetId, /* In of 0 on first call for new set. */
-		[out] SETID SetId,
+		[in,out,ref] SETID *SetId, /* In of 0 on first call for new set. */
 		[in] uint16 SequenceNum,
 		[in] uint16 cAddToSet,
 		[in] uint16 cDelFromSet,
@@ -60,7 +58,7 @@ interface IOXIDResolver
 		[in, size_is(cAddToSet)] OID AddToSet[],
 		/*remove these OIDs from the set */
 		[in, size_is(cDelFromSet)] OID DelFromSet[],
-		[out] uint16 PingBackoffFactor/* 2^factor = multipler */
+		[out,ref] uint16 *PingBackoffFactor/* 2^factor = multipler */
 			 );
 
 	/* In some cases the client maybe unsure that a particular */
@@ -80,9 +78,9 @@ interface IOXIDResolver
 											  [in] uint16 cRequestedProtseqs,
 											  [in, size_is(cRequestedProtseqs)] uint16 arRequestedProtseqs[],
 											  [out] DUALSTRINGARRAY *pdsaOxidBindings,
-											  [out] IPID ipidRemUnknown,
-											  [out] uint32 AuthnHint,
-											  [out] COMVERSION ComVersion
+											  [out,ref] IPID *ipidRemUnknown,
+											  [out,ref] uint32 *AuthnHint,
+											  [out,ref] COMVERSION *ComVersion
 											 );
 	typedef struct {
 		COMVERSION version;
@@ -90,7 +88,7 @@ interface IOXIDResolver
 	} COMINFO;
 
 	[idempotent] WERROR ServerAlive2 (
-	  [out] COMINFO info,
-	  [out] DUALSTRINGARRAY dualstring,
+	  [out,ref] COMINFO *info,
+	  [out,ref] DUALSTRINGARRAY *dualstring,
 	  [out] uint8 unknown2[3]);
 }
diff --git a/source4/librpc/idl/remact.idl b/source4/librpc/idl/remact.idl
index 2f8baf926a..16ac5f60c1 100644
--- a/source4/librpc/idl/remact.idl
+++ b/source4/librpc/idl/remact.idl
@@ -8,8 +8,7 @@
 	pointer_default(unique),
   	pointer_default_top(unique),
 	endpoint("ncalrpc:", "ncacn_ip_tcp:[135]", "ncacn_np:[\\pipe\\epmapper]"),
-	depends(dcom,orpc),
-	keepref
+	depends(dcom,orpc)
 ]
 interface IRemoteActivation
 {
@@ -25,7 +24,7 @@ interface IRemoteActivation
 	const uint32 MODE_GET_CLASS_OBJECT = 0xffffffff;
 	WERROR RemoteActivation (
 			[in] ORPCTHIS this,
-			[out] ORPCTHAT that,
+			[out,ref] ORPCTHAT *that,
 			[in] GUID Clsid,
 			[in] [string,charset(UTF16)] uint16 *pwszObjectName,
 			[in] MInterfacePointer *pObjectStorage,
@@ -35,12 +34,12 @@ interface IRemoteActivation
 			[in,size_is(Interfaces)] GUID *pIIDs,
 			[in] uint16 num_protseqs,
 			[in, size_is(num_protseqs)] uint16 protseq[*],
-			[out] hyper pOxid,
-			[out] DUALSTRINGARRAY *pdsaOxidBindings,
-			[out] GUID ipidRemUnknown,
-			[out] uint32 AuthnHint,
-			[out] COMVERSION ServerVersion,
-			[out] WERROR hr,
+			[out,ref] hyper *pOxid,
+			[out,ref] DUALSTRINGARRAY *pdsaOxidBindings,
+			[out,ref] GUID *ipidRemUnknown,
+			[out,ref] uint32 *AuthnHint,
+			[out,ref] COMVERSION *ServerVersion,
+			[out,ref] WERROR *hr,
 			[out,size_is(Interfaces)] MInterfacePointer *ifaces[],
 			[out,size_is(Interfaces)] WERROR results[]
 			);
diff --git a/source4/librpc/idl/rot.idl b/source4/librpc/idl/rot.idl
index 27c7836635..abc210aa35 100644
--- a/source4/librpc/idl/rot.idl
+++ b/source4/librpc/idl/rot.idl
@@ -5,15 +5,14 @@
   	pointer_default_top(unique),
 	depends(orpc),
  	endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]", 
-		  "ncalrpc:[EPMAPPER]"),
-	keepref
+		  "ncalrpc:[EPMAPPER]")
 ] interface rot
 {
 	WERROR rot_add (
 					[in] uint32 flags, 
 					[in] MInterfacePointer *unk, 
 					[in] MInterfacePointer *moniker, 
-					[out] uint32 rotid
+					[out,ref] uint32 *rotid
 					);
 	
 	WERROR rot_remove (
@@ -26,7 +25,7 @@
 	
 	WERROR rot_get_interface_pointer (
 					 [in] MInterfacePointer *moniker, 
-					 [out] MInterfacePointer *ip
+					 [out,ref] MInterfacePointer *ip
 					 );
 	
 	WERROR rot_set_modification_time (
@@ -36,7 +35,7 @@
 	
 	WERROR rot_get_modification_time (
 							   [in] MInterfacePointer *moniker,
-							   [out] NTTIME t
+							   [out,ref] NTTIME *t
 							   );
 	
 	WERROR rot_enum (
diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl
index a3470ef78c..0f67b3d5fe 100644
--- a/source4/librpc/idl/samr.idl
+++ b/source4/librpc/idl/samr.idl
@@ -13,8 +13,7 @@
   endpoint("ncacn_np:[\\pipe\\samr]","ncacn_ip_tcp:", "ncalrpc:"),
   pointer_default(unique),
   pointer_default_top(unique),
-  depends(misc,lsa,security),
-  keepref
+  depends(misc,lsa,security)
 ] interface samr
 {
 	declare bitmap security_secinfo;
diff --git a/source4/librpc/idl/spoolss.idl b/source4/librpc/idl/spoolss.idl
index 02e6ff3f37..3e900c95ce 100644
--- a/source4/librpc/idl/spoolss.idl
+++ b/source4/librpc/idl/spoolss.idl
@@ -11,8 +11,7 @@
   pointer_default_top(unique),
   helpstring("Spooler SubSystem"),
   depends(security),
-  helper("librpc/ndr/ndr_spoolss_buf.h"),
-  keepref
+  helper("librpc/ndr/ndr_spoolss_buf.h")
 ] interface spoolss
 {
 	typedef struct {
diff --git a/source4/librpc/idl/srvsvc.idl b/source4/librpc/idl/srvsvc.idl
index 2ebd98fa31..b62a3827d1 100644
--- a/source4/librpc/idl/srvsvc.idl
+++ b/source4/librpc/idl/srvsvc.idl
@@ -10,8 +10,7 @@
   pointer_default(unique),
   pointer_default_top(unique),
   helpstring("Server Service"),
-  depends(security,svcctl),
-  keepref
+  depends(security,svcctl)
 ] interface srvsvc
 {
 	declare bitmap svcctl_ServerType;
diff --git a/source4/librpc/idl/svcctl.idl b/source4/librpc/idl/svcctl.idl
index 97460217f5..57d25efd0d 100644
--- a/source4/librpc/idl/svcctl.idl
+++ b/source4/librpc/idl/svcctl.idl
@@ -9,8 +9,7 @@
   pointer_default(unique),
   pointer_default_top(unique),
   endpoint("ncacn_np:[\\pipe\\svcctl]", "ncalrpc:"),
-  helpstring("Service Control"),
-  keepref
+  helpstring("Service Control")
 ] interface svcctl
 {
 	typedef struct {
diff --git a/source4/librpc/idl/unixinfo.idl b/source4/librpc/idl/unixinfo.idl
index 086cfc7486..4b12a3056a 100644
--- a/source4/librpc/idl/unixinfo.idl
+++ b/source4/librpc/idl/unixinfo.idl
@@ -8,8 +8,7 @@
   endpoint("ncacn_np:[\\pipe\\unixinfo]", "ncacn_ip_tcp:", "ncalrpc:"),
   pointer_default(unique),
   helpstring("Unixinfo specific stuff"),
-  depends(security),
-  keepref
+  depends(security)
 ] interface unixinfo
 {
 	/******************/
diff --git a/source4/librpc/idl/winreg.idl b/source4/librpc/idl/winreg.idl
index 04521304e7..03b034b38f 100644
--- a/source4/librpc/idl/winreg.idl
+++ b/source4/librpc/idl/winreg.idl
@@ -9,8 +9,7 @@
   pointer_default(unique),
   pointer_default_top(unique),
   helpstring("Remote Registry Service"),
-  depends(lsa,initshutdown,security),
-  keepref
+  depends(lsa,initshutdown,security)
 ] interface winreg
 {
 	declare bitmap security_secinfo;
diff --git a/source4/librpc/idl/wkssvc.idl b/source4/librpc/idl/wkssvc.idl
index a085265a41..d658091c47 100644
--- a/source4/librpc/idl/wkssvc.idl
+++ b/source4/librpc/idl/wkssvc.idl
@@ -7,8 +7,7 @@
   pointer_default(unique),
   pointer_default_top(unique),
   helpstring("Workstation Service"),
-  depends(srvsvc),
-  keepref
+  depends(srvsvc)
 ] interface wkssvc
 {
 	declare [v1_enum] enum srvsvc_PlatformId;