svn commit: samba r4158 - in branches/SAMBA_4_0/source: librpc/idl torture/rpc

[jelmer at samba.org]

Author: jelmer
Date: 2004-12-12 00:35:50 +0000 (Sun, 12 Dec 2004)
New Revision: 4158

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4158

Log:
Fix IDL for InitiateShutdown and AbortShutdown and run both only
when dangerous tests are enabled.

Modified:
   branches/SAMBA_4_0/source/librpc/idl/winreg.idl
   branches/SAMBA_4_0/source/torture/rpc/winreg.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/winreg.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/winreg.idl	2004-12-12 00:22:30 UTC (rev 4157)
+++ branches/SAMBA_4_0/source/librpc/idl/winreg.idl	2004-12-12 00:35:50 UTC (rev 4158)
@@ -262,17 +262,17 @@
 	/******************/
 	/* Function: 0x18 */
 	WERROR winreg_InitiateSystemShutdown(
-		[in]	winreg_String hostname,
-		[in]	winreg_String message,
+		[in]	uint16 *hostname,
+		[in]	winreg_String *message,
 		[in]	uint32 timeout,
-		[in]	uint16 flags,
-		[out]	uint16 status
+		[in]	uint8 force_apps,
+		[in]	uint8 reboot
 	);
 
 	/******************/
 	/* Function: 0x19 */
 	WERROR winreg_AbortSystemShutdown(
-		[in,ref]	uint16 *server
+		[in]	uint16 *server
 	);
 
 	/******************/

Modified: branches/SAMBA_4_0/source/torture/rpc/winreg.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/winreg.c	2004-12-12 00:22:30 UTC (rev 4157)
+++ branches/SAMBA_4_0/source/torture/rpc/winreg.c	2004-12-12 00:35:50 UTC (rev 4158)
@@ -526,10 +526,12 @@
 	struct winreg_InitiateSystemShutdown r;
 	NTSTATUS status;
 	
-	init_winreg_String(&r.in.hostname, NULL);
-	init_winreg_String(&r.in.message, msg);
-	r.in.flags = 0;
+	r.in.hostname = NULL;
+	r.in.message = talloc_p(mem_ctx, struct winreg_String);
+	init_winreg_String(r.in.message, msg);
+	r.in.force_apps = 1;
 	r.in.timeout = timeout;
+	r.in.reboot = 1;
 
 	status = dcerpc_winreg_InitiateSystemShutdown(p, mem_ctx, &r);
 
@@ -706,12 +708,13 @@
 		return False;
 	}
 
-	if(!test_InitiateSystemShutdown(p, mem_ctx, "spottyfood", 30))
-		ret = False;
+    if (lp_parm_int(-1, "torture", "dangerous") != 1) {
+		printf("winreg_InitiateShutdown disabled - enable dangerous tests to use\n");
+	
+		ret &= test_InitiateSystemShutdown(p, mem_ctx, "spottyfood", 30);
+		ret &= test_AbortSystemShutdown(p, mem_ctx);
+	}
 
-	if(!test_AbortSystemShutdown(p, mem_ctx))
-		ret = False;
-
 	for (i = 0; i < ARRAY_SIZE(open_fns); i++) {
 		if (!test_Open(p, mem_ctx, open_fns[i]))
 			ret = False;