r4175: InitiateSystemShutdownEx IDL and torture test

(This used to be commit 3538130bf5d656ed4b0e2c84294e995814860e34)

diff --git a/source4/librpc/idl/winreg.idl b/source4/librpc/idl/winreg.idl
index 37049142d23652dfb259420198dfc03059bcd47e..a77af21a4b00ea98ed6b553e105cacbe6647d8af 100644 (file)
--- a/source4/librpc/idl/winreg.idl
+++ b/source4/librpc/idl/winreg.idl
@@ -324,7 +324,13 @@
        /******************/
        /* Function: 0x1e */
        WERROR winreg_InitiateSystemShutdownEx(
-               );
+               [in] uint16 *hostname,
+               [in] winreg_String *message,
+               [in] uint32 timeout,
+               [in] uint8 force_apps,
+               [in] uint8 reboot,
+               [in] uint32 reason
+       );
 
        /******************/
        /* Function: 0x1f */

diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index 97bf091d51d49677b6de218be4953c672ea37207..e15ee23c37e2270ff100c1b2830e90da34d5b86c 100644 (file)
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -578,6 +578,35 @@ static BOOL test_InitiateSystemShutdown(struct dcerpc_pipe *p, TALLOC_CTX *mem_c
        return True;
 }
 
+static BOOL test_InitiateSystemShutdownEx(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
+                       const char *msg, uint32_t timeout)
+{
+       struct winreg_InitiateSystemShutdownEx r;
+       NTSTATUS status;
+       
+       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;
+       r.in.reason = 0;
+
+       status = dcerpc_winreg_InitiateSystemShutdownEx(p, mem_ctx, &r);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("InitiateSystemShutdownEx failed - %s\n", nt_errstr(status));
+               return False;
+       }
+
+       if (!W_ERROR_IS_OK(r.out.result)) {
+               printf("InitiateSystemShutdownEx failed - %s\n", win_errstr(r.out.result));
+               return False;
+       }
+
+       return True;
+}
+
 static BOOL test_AbortSystemShutdown(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
        struct winreg_AbortSystemShutdown r;
@@ -746,6 +775,8 @@ BOOL torture_rpc_winreg(void)
        } else {
                ret &= test_InitiateSystemShutdown(p, mem_ctx, "spottyfood", 30);
                ret &= test_AbortSystemShutdown(p, mem_ctx);
+               ret &= test_InitiateSystemShutdownEx(p, mem_ctx, "spottyfood", 30);
+               ret &= test_AbortSystemShutdown(p, mem_ctx);
        }
 
        for (i = 0; i < ARRAY_SIZE(open_fns); i++) {