use [subcontext] to make GetPrinter a bit easier in smbtorture

(This used to be commit a5140985d8f57695b4165c72af217092da6fae5f)

2 files changed, 3 insertions, 27 deletions

diff --git a/source4/librpc/idl/echo.idl b/source4/librpc/idl/echo.idl
index f7c65485f8..f68bcf38c3 100644
--- a/source4/librpc/idl/echo.idl
+++ b/source4/librpc/idl/echo.idl
@@ -25,27 +25,7 @@ interface rpcecho
 		[out,ref,size_is(len)] uint8 *data
 	);
 
-#define int uint32
-
-	typedef struct {
-		int *count;
-	} echo_Enum1;
-
-	typedef struct {
-		int *count;
-	} echo_Enum3;
-
-	typedef union {
-		[case(1)] echo_Enum1 enum1;
-		[case(3)] echo_Enum3 enum3;
-	} echo_EnumInfo;
-
-	typedef struct {
-		int level;
-		[switch_is(level)] echo_EnumInfo e;
-	} Struct1;
-	
 	void TestCall (
-		[out]        Struct1 *s1
+		[in]  unistr *s
 		);
 }
diff --git a/source4/librpc/idl/spoolss.idl b/source4/librpc/idl/spoolss.idl
index 4800d8ff2a..f39c17c395 100644
--- a/source4/librpc/idl/spoolss.idl
+++ b/source4/librpc/idl/spoolss.idl
@@ -99,10 +99,6 @@
 	} spoolss_PrinterInfo5;
 
 	typedef struct {
-		uint32 foo;
-	} spoolss_PrinterInfo6;
-
-	typedef struct {
 		[relative] nstring guid; /* text form of printer guid */
 		uint32 action;
 	} spoolss_PrinterInfo7;
@@ -113,7 +109,6 @@
 		case(3) spoolss_PrinterInfo3 info3;
 		case(4) spoolss_PrinterInfo4 info4;
 		case(5) spoolss_PrinterInfo5 info5;
-		case(6) spoolss_PrinterInfo6 info6;
 		case(7) spoolss_PrinterInfo7 info7;
 	} spoolss_PrinterInfo;
 
@@ -178,7 +173,8 @@
 	WERROR spoolss_GetPrinter(
 		[in,ref]     policy_handle *handle,
 		[in]	     uint32 level,
-		[in,out]     DATA_BLOB *buffer,
+		[in]         DATA_BLOB *buffer,
+		[out,subcontext,switch_is(level)] spoolss_PrinterInfo *info,
 		[in,out,ref] uint32 *buf_size
 		);