From 1bb969520392ea41b1c6841af2164bbca01381fe Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 4 Jan 2003 08:44:05 +0000 Subject: Missed from previous commit - merge from HEAD the changes to the remote shutdown struct - it's 2 byte-boolean flags, not 16 bits. (This used to be commit b5962833527787b0cb3f3904422f252e8d74f40d) --- source3/rpc_parse/parse_reg.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'source3') diff --git a/source3/rpc_parse/parse_reg.c b/source3/rpc_parse/parse_reg.c index 712d38da2b..456fad69b4 100644 --- a/source3/rpc_parse/parse_reg.c +++ b/source3/rpc_parse/parse_reg.c @@ -1736,8 +1736,8 @@ BOOL reg_io_r_open_entry(const char *desc, REG_R_OPEN_ENTRY *r_r, prs_struct *p /******************************************************************* Inits a structure. ********************************************************************/ -void init_reg_q_shutdown(REG_Q_SHUTDOWN * q_s, - const char *msg, uint32 timeout, uint16 flags) +void init_reg_q_shutdown(REG_Q_SHUTDOWN * q_s, const char *msg, + uint32 timeout, BOOL reboot, BOOL force) { int msg_len; msg_len = strlen(msg); @@ -1750,7 +1750,9 @@ void init_reg_q_shutdown(REG_Q_SHUTDOWN * q_s, init_unistr2(&(q_s->uni_msg), msg, msg_len); q_s->timeout = timeout; - q_s->flags = flags; + + q_s->reboot = reboot ? 1 : 0; + q_s->force = force ? 1 : 0; } @@ -1785,7 +1787,9 @@ BOOL reg_io_q_shutdown(const char *desc, REG_Q_SHUTDOWN * q_s, prs_struct *ps, if (!prs_uint32("timeout", ps, depth, &(q_s->timeout))) return False; - if (!prs_uint16("flags ", ps, depth, &(q_s->flags))) + if (!prs_uint8("force ", ps, depth, &(q_s->force))) + return False; + if (!prs_uint8("reboot ", ps, depth, &(q_s->reboot))) return False; return True; -- cgit