sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

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

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-10-15 16:25:06 +02:00
parent 310dc3e42d
commit 5d408ccf83
15 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
librpc/idl/initshutdown.idl
View File

@ -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
);
}

8
source3/librpc/gen_ndr/cli_initshutdown.c
View File

@ -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) {

4
source3/librpc/gen_ndr/cli_initshutdown.h
View File

@ -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__ */

8
source3/librpc/gen_ndr/cli_winreg.c
View File

@ -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) {

4
source3/librpc/gen_ndr/cli_winreg.h
View File

@ -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,

4
source3/librpc/gen_ndr/initshutdown.h
View File

@ -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;

12
source3/librpc/gen_ndr/ndr_initshutdown.c
View File

@ -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--;
}

12
source3/librpc/gen_ndr/ndr_winreg.c
View File

@ -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--;
}

4
source3/librpc/gen_ndr/winreg.h
View File

@ -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;

4
source3/librpc/idl/winreg.idl
View File

@ -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
);

4
source3/rpc_server/srv_initshutdown_nt.c
View File

@ -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);

4
source3/rpc_server/srv_winreg_nt.c
View File

@ -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 );

4
source4/librpc/idl/winreg.idl
View File

@ -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
);

4
source4/torture/rpc/initshutdown.c
View File

@ -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);

4
source4/torture/rpc/winreg.c
View File

@ -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,