diff options
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/srv_initshutdown_nt.c | 4 | ||||
| -rw-r--r-- | source3/rpc_server/srv_winreg_nt.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source3/rpc_server/srv_initshutdown_nt.c b/source3/rpc_server/srv_initshutdown_nt.c index 8b3ef52293..f7d299830d 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.do_reboot = r->in.do_reboot; + s.in.reboot = r->in.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.do_reboot = r->in.do_reboot; + s.in.reboot = r->in.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 3991c5ae02..b3aef270f3 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.do_reboot = r->in.do_reboot; + s.in.reboot = r->in.reboot; s.in.reason = 0; /* thunk down to _winreg_InitiateSystemShutdownEx() @@ -514,8 +514,8 @@ WERROR _winreg_InitiateSystemShutdownEx(pipes_struct *p, struct winreg_InitiateS /* pull the message string and perform necessary sanity checks on it */ - if ( r->in.message && r->in.message->name && r->in.message->name->name ) { - if ( (msg = talloc_strdup(p->mem_ctx, r->in.message->name->name )) == NULL ) { + if ( r->in.message && r->in.message->string ) { + if ( (msg = talloc_strdup(p->mem_ctx, r->in.message->string )) == NULL ) { return WERR_NOMEM; } chkmsg = TALLOC_ARRAY(p->mem_ctx, char, strlen(msg)+1); @@ -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.do_reboot ? SHUTDOWN_R_STRING : ""); + fstr_sprintf(do_reboot, r->in.reboot ? SHUTDOWN_R_STRING : ""); fstr_sprintf(f, r->in.force_apps ? SHUTDOWN_F_STRING : ""); fstr_sprintf(str_reason, "%d", r->in.reason ); |