Rename reboot -> do_reboot since the first is a reserved name on FreeBSD.

diff --git a/librpc/idl/initshutdown.idl b/librpc/idl/initshutdown.idl
index ac30be70ddb1c90bc95c72a58ffce06a84a284bd..02b2501c1dae7a51cc236ed83ae866eba0568ac0 100644 (file)
--- a/librpc/idl/initshutdown.idl
+++ b/librpc/idl/initshutdown.idl
@@ -23,7 +23,7 @@ import "lsa.idl";
                [in,unique] lsa_StringLarge *message,
                [in] uint32 timeout,
                [in] uint8 force_apps,
-               [in] uint8 reboot
+               [in] uint8 do_reboot
        );
 
        WERROR initshutdown_Abort(
@@ -39,7 +39,7 @@ import "lsa.idl";
                [in,unique] lsa_StringLarge *message,
                [in] uint32 timeout,
                [in] uint8 force_apps,
-               [in] uint8 reboot,
+               [in] uint8 do_reboot,
                [in] uint32 reason
        );
 }

diff --git a/source3/librpc/gen_ndr/cli_initshutdown.c b/source3/librpc/gen_ndr/cli_initshutdown.c
index 699c69ef78e809cdc4fd99e6aaf325d56610a61c..bc8ca5b5f128cf64782eabdfb5c5a6bbaf487fb6 100644 (file)
--- a/source3/librpc/gen_ndr/cli_initshutdown.c
+++ b/source3/librpc/gen_ndr/cli_initshutdown.c
@@ -12,7 +12,7 @@ NTSTATUS rpccli_initshutdown_Init(struct rpc_pipe_client *cli,
                                  struct lsa_StringLarge *message /* [in] [unique] */,
                                  uint32_t timeout /* [in]  */,
                                  uint8_t force_apps /* [in]  */,
-                                 uint8_t reboot /* [in]  */,
+                                 uint8_t do_reboot /* [in]  */,
                                  WERROR *werror)
 {
        struct initshutdown_Init r;
@@ -23,7 +23,7 @@ NTSTATUS rpccli_initshutdown_Init(struct rpc_pipe_client *cli,
        r.in.message = message;
        r.in.timeout = timeout;
        r.in.force_apps = force_apps;
-       r.in.reboot = reboot;
+       r.in.do_reboot = do_reboot;
 
        if (DEBUGLEVEL >= 10) {
                NDR_PRINT_IN_DEBUG(initshutdown_Init, &r);
@@ -106,7 +106,7 @@ NTSTATUS rpccli_initshutdown_InitEx(struct rpc_pipe_client *cli,
                                    struct lsa_StringLarge *message /* [in] [unique] */,
                                    uint32_t timeout /* [in]  */,
                                    uint8_t force_apps /* [in]  */,
-                                   uint8_t reboot /* [in]  */,
+                                   uint8_t do_reboot /* [in]  */,
                                    uint32_t reason /* [in]  */,
                                    WERROR *werror)
 {
@@ -118,7 +118,7 @@ NTSTATUS rpccli_initshutdown_InitEx(struct rpc_pipe_client *cli,
        r.in.message = message;
        r.in.timeout = timeout;
        r.in.force_apps = force_apps;
-       r.in.reboot = reboot;
+       r.in.do_reboot = do_reboot;
        r.in.reason = reason;
 
        if (DEBUGLEVEL >= 10) {

diff --git a/source3/librpc/gen_ndr/cli_initshutdown.h b/source3/librpc/gen_ndr/cli_initshutdown.h
index 28208b861db85ac563ec223a1f0f438565c6c695..e2eb9daabef8c6f45aaa9bfbb0525badd732c001 100644 (file)
--- a/source3/librpc/gen_ndr/cli_initshutdown.h
+++ b/source3/librpc/gen_ndr/cli_initshutdown.h
@@ -7,7 +7,7 @@ NTSTATUS rpccli_initshutdown_Init(struct rpc_pipe_client *cli,
                                  struct lsa_StringLarge *message /* [in] [unique] */,
                                  uint32_t timeout /* [in]  */,
                                  uint8_t force_apps /* [in]  */,
-                                 uint8_t reboot /* [in]  */,
+                                 uint8_t do_reboot /* [in]  */,
                                  WERROR *werror);
 NTSTATUS rpccli_initshutdown_Abort(struct rpc_pipe_client *cli,
                                   TALLOC_CTX *mem_ctx,
@@ -19,7 +19,7 @@ NTSTATUS rpccli_initshutdown_InitEx(struct rpc_pipe_client *cli,
                                    struct lsa_StringLarge *message /* [in] [unique] */,
                                    uint32_t timeout /* [in]  */,
                                    uint8_t force_apps /* [in]  */,
-                                   uint8_t reboot /* [in]  */,
+                                   uint8_t do_reboot /* [in]  */,
                                    uint32_t reason /* [in]  */,
                                    WERROR *werror);
 #endif /* __CLI_INITSHUTDOWN__ */

diff --git a/source3/librpc/gen_ndr/cli_winreg.c b/source3/librpc/gen_ndr/cli_winreg.c
index fb6ec4983decea8c8cc58d96a28a031253b5a17f..c0a0bd8f142db1fb1fa1210f6dff9f8b3146981c 100644 (file)
--- a/source3/librpc/gen_ndr/cli_winreg.c
+++ b/source3/librpc/gen_ndr/cli_winreg.c
@@ -1212,7 +1212,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdown(struct rpc_pipe_client *cli,
                                              struct lsa_StringLarge *message /* [in] [unique] */,
                                              uint32_t timeout /* [in]  */,
                                              uint8_t force_apps /* [in]  */,
-                                             uint8_t reboot /* [in]  */,
+                                             uint8_t do_reboot /* [in]  */,
                                              WERROR *werror)
 {
        struct winreg_InitiateSystemShutdown r;
@@ -1223,7 +1223,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdown(struct rpc_pipe_client *cli,
        r.in.message = message;
        r.in.timeout = timeout;
        r.in.force_apps = force_apps;
-       r.in.reboot = reboot;
+       r.in.do_reboot = do_reboot;
 
        if (DEBUGLEVEL >= 10) {
                NDR_PRINT_IN_DEBUG(winreg_InitiateSystemShutdown, &r);
@@ -1501,7 +1501,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdownEx(struct rpc_pipe_client *cli,
                                                struct lsa_StringLarge *message /* [in] [unique] */,
                                                uint32_t timeout /* [in]  */,
                                                uint8_t force_apps /* [in]  */,
-                                               uint8_t reboot /* [in]  */,
+                                               uint8_t do_reboot /* [in]  */,
                                                uint32_t reason /* [in]  */,
                                                WERROR *werror)
 {
@@ -1513,7 +1513,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdownEx(struct rpc_pipe_client *cli,
        r.in.message = message;
        r.in.timeout = timeout;
        r.in.force_apps = force_apps;
-       r.in.reboot = reboot;
+       r.in.do_reboot = do_reboot;
        r.in.reason = reason;
 
        if (DEBUGLEVEL >= 10) {

diff --git a/source3/librpc/gen_ndr/cli_winreg.h b/source3/librpc/gen_ndr/cli_winreg.h
index 3122ebeba10217209e0399164d113057f4a785ba..a8a617ce2c9ed8ba617ae42ab69903b50723acf1 100644 (file)
--- a/source3/librpc/gen_ndr/cli_winreg.h
+++ b/source3/librpc/gen_ndr/cli_winreg.h
@@ -168,7 +168,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdown(struct rpc_pipe_client *cli,
                                              struct lsa_StringLarge *message /* [in] [unique] */,
                                              uint32_t timeout /* [in]  */,
                                              uint8_t force_apps /* [in]  */,
-                                             uint8_t reboot /* [in]  */,
+                                             uint8_t do_reboot /* [in]  */,
                                              WERROR *werror);
 NTSTATUS rpccli_winreg_AbortSystemShutdown(struct rpc_pipe_client *cli,
                                           TALLOC_CTX *mem_ctx,
@@ -205,7 +205,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdownEx(struct rpc_pipe_client *cli,
                                                struct lsa_StringLarge *message /* [in] [unique] */,
                                                uint32_t timeout /* [in]  */,
                                                uint8_t force_apps /* [in]  */,
-                                               uint8_t reboot /* [in]  */,
+                                               uint8_t do_reboot /* [in]  */,
                                                uint32_t reason /* [in]  */,
                                                WERROR *werror);
 NTSTATUS rpccli_winreg_SaveKeyEx(struct rpc_pipe_client *cli,

diff --git a/source3/librpc/gen_ndr/initshutdown.h b/source3/librpc/gen_ndr/initshutdown.h
index aa959cf77b63c3ece45d3c9052afcfcbcd1ffb32..014e2fe6898d7a87e71b9e07e08d705b8e58c80a 100644 (file)
--- a/source3/librpc/gen_ndr/initshutdown.h
+++ b/source3/librpc/gen_ndr/initshutdown.h
@@ -13,7 +13,7 @@ struct initshutdown_Init {
                struct lsa_StringLarge *message;/* [unique] */
                uint32_t timeout;
                uint8_t force_apps;
-               uint8_t reboot;
+               uint8_t do_reboot;
        } in;
 
        struct {
@@ -41,7 +41,7 @@ struct initshutdown_InitEx {
                struct lsa_StringLarge *message;/* [unique] */
                uint32_t timeout;
                uint8_t force_apps;
-               uint8_t reboot;
+               uint8_t do_reboot;
                uint32_t reason;
        } in;
 

diff --git a/source3/librpc/gen_ndr/ndr_initshutdown.c b/source3/librpc/gen_ndr/ndr_initshutdown.c
index c34d782b2a4343ccf87b5d77e63f7189aa4b40a1..62a19af3a262a340e9ff4287cc74233b75117182 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_initshutdown.c
+++ b/source3/librpc/gen_ndr/ndr_initshutdown.c
@@ -17,7 +17,7 @@ static enum ndr_err_code ndr_push_initshutdown_Init(struct ndr_push *ndr, int fl
                }
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.timeout));
                NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.force_apps));
-               NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.reboot));
+               NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.do_reboot));
        }
        if (flags & NDR_OUT) {
                NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
@@ -58,7 +58,7 @@ static enum ndr_err_code ndr_pull_initshutdown_Init(struct ndr_pull *ndr, int fl
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.timeout));
                NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.force_apps));
-               NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.reboot));
+               NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.do_reboot));
        }
        if (flags & NDR_OUT) {
                NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
@@ -90,7 +90,7 @@ _PUBLIC_ void ndr_print_initshutdown_Init(struct ndr_print *ndr, const char *nam
                ndr->depth--;
                ndr_print_uint32(ndr, "timeout", r->in.timeout);
                ndr_print_uint8(ndr, "force_apps", r->in.force_apps);
-               ndr_print_uint8(ndr, "reboot", r->in.reboot);
+               ndr_print_uint8(ndr, "do_reboot", r->in.do_reboot);
                ndr->depth--;
        }
        if (flags & NDR_OUT) {
@@ -180,7 +180,7 @@ static enum ndr_err_code ndr_push_initshutdown_InitEx(struct ndr_push *ndr, int
                }
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.timeout));
                NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.force_apps));
-               NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.reboot));
+               NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.do_reboot));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.reason));
        }
        if (flags & NDR_OUT) {
@@ -222,7 +222,7 @@ static enum ndr_err_code ndr_pull_initshutdown_InitEx(struct ndr_pull *ndr, int
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.timeout));
                NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.force_apps));
-               NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.reboot));
+               NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.do_reboot));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.reason));
        }
        if (flags & NDR_OUT) {
@@ -255,7 +255,7 @@ _PUBLIC_ void ndr_print_initshutdown_InitEx(struct ndr_print *ndr, const char *n
                ndr->depth--;
                ndr_print_uint32(ndr, "timeout", r->in.timeout);
                ndr_print_uint8(ndr, "force_apps", r->in.force_apps);
-               ndr_print_uint8(ndr, "reboot", r->in.reboot);
+               ndr_print_uint8(ndr, "do_reboot", r->in.do_reboot);
                ndr_print_uint32(ndr, "reason", r->in.reason);
                ndr->depth--;
        }

diff --git a/source3/librpc/gen_ndr/ndr_winreg.c b/source3/librpc/gen_ndr/ndr_winreg.c
index 56ff59e8e93dd3e4d52f465e3bafc7f99b11f8ef..8fed96867b8096faa8451a78c27a09d32bd0c6b7 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_winreg.c
+++ b/source3/librpc/gen_ndr/ndr_winreg.c
@@ -3210,7 +3210,7 @@ static enum ndr_err_code ndr_push_winreg_InitiateSystemShutdown(struct ndr_push
                }
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.timeout));
                NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.force_apps));
-               NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.reboot));
+               NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.do_reboot));
        }
        if (flags & NDR_OUT) {
                NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
@@ -3251,7 +3251,7 @@ static enum ndr_err_code ndr_pull_winreg_InitiateSystemShutdown(struct ndr_pull
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.timeout));
                NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.force_apps));
-               NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.reboot));
+               NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.do_reboot));
        }
        if (flags & NDR_OUT) {
                NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
@@ -3283,7 +3283,7 @@ _PUBLIC_ void ndr_print_winreg_InitiateSystemShutdown(struct ndr_print *ndr, con
                ndr->depth--;
                ndr_print_uint32(ndr, "timeout", r->in.timeout);
                ndr_print_uint8(ndr, "force_apps", r->in.force_apps);
-               ndr_print_uint8(ndr, "reboot", r->in.reboot);
+               ndr_print_uint8(ndr, "do_reboot", r->in.do_reboot);
                ndr->depth--;
        }
        if (flags & NDR_OUT) {
@@ -3901,7 +3901,7 @@ static enum ndr_err_code ndr_push_winreg_InitiateSystemShutdownEx(struct ndr_pus
                }
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.timeout));
                NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.force_apps));
-               NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.reboot));
+               NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.do_reboot));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.reason));
        }
        if (flags & NDR_OUT) {
@@ -3943,7 +3943,7 @@ static enum ndr_err_code ndr_pull_winreg_InitiateSystemShutdownEx(struct ndr_pul
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.timeout));
                NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.force_apps));
-               NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.reboot));
+               NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.do_reboot));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.reason));
        }
        if (flags & NDR_OUT) {
@@ -3976,7 +3976,7 @@ _PUBLIC_ void ndr_print_winreg_InitiateSystemShutdownEx(struct ndr_print *ndr, c
                ndr->depth--;
                ndr_print_uint32(ndr, "timeout", r->in.timeout);
                ndr_print_uint8(ndr, "force_apps", r->in.force_apps);
-               ndr_print_uint8(ndr, "reboot", r->in.reboot);
+               ndr_print_uint8(ndr, "do_reboot", r->in.do_reboot);
                ndr_print_uint32(ndr, "reason", r->in.reason);
                ndr->depth--;
        }

diff --git a/source3/librpc/gen_ndr/winreg.h b/source3/librpc/gen_ndr/winreg.h
index 33331dbf18e05a9d8690533579cd985a2f7d1804..aa039df48444dcdf9119d792e79af4c1f6aa68dc 100644 (file)
--- a/source3/librpc/gen_ndr/winreg.h
+++ b/source3/librpc/gen_ndr/winreg.h
@@ -485,7 +485,7 @@ struct winreg_InitiateSystemShutdown {
                struct lsa_StringLarge *message;/* [unique] */
                uint32_t timeout;
                uint8_t force_apps;
-               uint8_t reboot;
+               uint8_t do_reboot;
        } in;
 
        struct {
@@ -573,7 +573,7 @@ struct winreg_InitiateSystemShutdownEx {
                struct lsa_StringLarge *message;/* [unique] */
                uint32_t timeout;
                uint8_t force_apps;
-               uint8_t reboot;
+               uint8_t do_reboot;
                uint32_t reason;
        } in;
 

diff --git a/source3/librpc/idl/winreg.idl b/source3/librpc/idl/winreg.idl
index e447e76ef259ce8433883cebebec65f3bc69a90d..ba9e93564075d4453e4ed035bab2ebedc561dcb6 100644 (file)
--- a/source3/librpc/idl/winreg.idl
+++ b/source3/librpc/idl/winreg.idl
@@ -318,7 +318,7 @@ import "lsa.idl", "initshutdown.idl", "security.idl";
                [in,unique] lsa_StringLarge *message,
                [in]    uint32 timeout,
                [in]    uint8 force_apps,
-               [in]    uint8 reboot
+               [in]    uint8 do_reboot
        );
 
        /******************/
@@ -378,7 +378,7 @@ import "lsa.idl", "initshutdown.idl", "security.idl";
                [in,unique] lsa_StringLarge *message,
                [in] uint32 timeout,
                [in] uint8 force_apps,
-               [in] uint8 reboot,
+               [in] uint8 do_reboot,
                [in] uint32 reason
        );
 

diff --git a/source3/rpc_server/srv_initshutdown_nt.c b/source3/rpc_server/srv_initshutdown_nt.c
index f7d299830dff23c2167f52a6d7cef2d0d78b6f31..8b3ef522939463e6ac68f6188e288addc9a5495f 100644 (file)
--- a/source3/rpc_server/srv_initshutdown_nt.c
+++ b/source3/rpc_server/srv_initshutdown_nt.c
@@ -37,7 +37,7 @@ WERROR _initshutdown_Init(pipes_struct *p, struct initshutdown_Init *r)
        s.in.message = r->in.message;
        s.in.timeout = r->in.timeout;
        s.in.force_apps = r->in.force_apps;
-       s.in.reboot = r->in.reboot;
+       s.in.do_reboot = r->in.do_reboot;
        s.in.reason = 0;
 
        /* thunk down to _winreg_InitiateSystemShutdownEx() 
@@ -56,7 +56,7 @@ WERROR _initshutdown_InitEx(pipes_struct *p, struct initshutdown_InitEx *r)
        s.in.message = r->in.message;
        s.in.timeout = r->in.timeout;
        s.in.force_apps = r->in.force_apps;
-       s.in.reboot = r->in.reboot;
+       s.in.do_reboot = r->in.do_reboot;
        s.in.reason = r->in.reason;
 
        return _winreg_InitiateSystemShutdownEx( p, &s);

diff --git a/source3/rpc_server/srv_winreg_nt.c b/source3/rpc_server/srv_winreg_nt.c
index b3aef270f36c8b81acec4265c8b8cc70a34e8780..3a03f1809a13977805e72d6844b38f61f2398f0f 100644 (file)
--- a/source3/rpc_server/srv_winreg_nt.c
+++ b/source3/rpc_server/srv_winreg_nt.c
@@ -475,7 +475,7 @@ WERROR _winreg_InitiateSystemShutdown(pipes_struct *p, struct winreg_InitiateSys
        s.in.message = r->in.message;
        s.in.timeout = r->in.timeout;
        s.in.force_apps = r->in.force_apps;
-       s.in.reboot = r->in.reboot;
+       s.in.do_reboot = r->in.do_reboot;
        s.in.reason = 0;
 
        /* thunk down to _winreg_InitiateSystemShutdownEx() 
@@ -526,7 +526,7 @@ WERROR _winreg_InitiateSystemShutdownEx(pipes_struct *p, struct winreg_InitiateS
        }
 
        fstr_sprintf(str_timeout, "%d", r->in.timeout);
-       fstr_sprintf(do_reboot, r->in.reboot ? SHUTDOWN_R_STRING : "");
+       fstr_sprintf(do_reboot, r->in.do_reboot ? SHUTDOWN_R_STRING : "");
        fstr_sprintf(f, r->in.force_apps ? SHUTDOWN_F_STRING : "");
        fstr_sprintf(str_reason, "%d", r->in.reason );
 

diff --git a/source4/librpc/idl/winreg.idl b/source4/librpc/idl/winreg.idl
index 1e01a911977cac300d5603851c63c9ef32bdacc8..dfa0f654d07f8a2aeb65b9157c43cfe9ed2c381a 100644 (file)
--- a/source4/librpc/idl/winreg.idl
+++ b/source4/librpc/idl/winreg.idl
@@ -309,7 +309,7 @@ import "lsa.idl", "security.idl";
                [in,unique] lsa_StringLarge *message,
                [in]    uint32 timeout,
                [in]    uint8 force_apps,
-               [in]    uint8 reboot
+               [in]    uint8 do_reboot
        );
 
        /******************/
@@ -369,7 +369,7 @@ import "lsa.idl", "security.idl";
                [in,unique] lsa_StringLarge *message,
                [in] uint32 timeout,
                [in] uint8 force_apps,
-               [in] uint8 reboot,
+               [in] uint8 do_reboot,
                [in] uint32 reason
        );
 

diff --git a/source4/torture/rpc/initshutdown.c b/source4/torture/rpc/initshutdown.c
index 92fec5be0c32ca8bd42467897e0e9751cba5bb83..149fae6c265d9322438055b319ee7c169495ec22 100644 (file)
--- a/source4/torture/rpc/initshutdown.c
+++ b/source4/torture/rpc/initshutdown.c
@@ -61,7 +61,7 @@ static bool test_Init(struct torture_context *tctx,
        init_lsa_StringLarge(r.in.message, "spottyfood");
        r.in.force_apps = 1;
        r.in.timeout = 30;
-       r.in.reboot = 1;
+       r.in.do_reboot = 1;
 
        status = dcerpc_initshutdown_Init(p, tctx, &r);
 
@@ -83,7 +83,7 @@ static bool test_InitEx(struct torture_context *tctx,
        init_lsa_StringLarge(r.in.message, "spottyfood");
        r.in.force_apps = 1;
        r.in.timeout = 30;
-       r.in.reboot = 1;
+       r.in.do_reboot = 1;
        r.in.reason = 0;
 
        status = dcerpc_initshutdown_InitEx(p, tctx, &r);

diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index 898813f807563247ee6b51cfd78f6abf55136e37..aa81aa011b74a51bbd619729f9a4fa62fa6f8e61 100644 (file)
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -1630,7 +1630,7 @@ static bool test_InitiateSystemShutdown(struct torture_context *tctx,
        init_lsa_StringLarge(r.in.message, "spottyfood");
        r.in.force_apps = 1;
        r.in.timeout = 30;
-       r.in.reboot = 1;
+       r.in.do_reboot = 1;
 
        torture_assert_ntstatus_ok(tctx,
                                   dcerpc_winreg_InitiateSystemShutdown(p, tctx, &r),
@@ -1655,7 +1655,7 @@ static bool test_InitiateSystemShutdownEx(struct torture_context *tctx,
        init_lsa_StringLarge(r.in.message, "spottyfood");
        r.in.force_apps = 1;
        r.in.timeout = 30;
-       r.in.reboot = 1;
+       r.in.do_reboot = 1;
        r.in.reason = 0;
 
        torture_assert_ntstatus_ok(tctx,