From 5d408ccf83e0b95459fe5e8a9e31f685b0859973 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 15 Oct 2008 16:25:06 +0200 Subject: Rename reboot -> do_reboot since the first is a reserved name on FreeBSD. --- source3/rpc_server/srv_initshutdown_nt.c | 4 ++-- source3/rpc_server/srv_winreg_nt.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/rpc_server') diff --git a/source3/rpc_server/srv_initshutdown_nt.c b/source3/rpc_server/srv_initshutdown_nt.c index f7d299830d..8b3ef52293 100644 --- 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 b3aef270f3..3a03f1809a 100644 --- 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 ); -- cgit