summaryrefslogtreecommitdiffstats
path: root/source/rpc_parse/parse_shutdown.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/rpc_parse/parse_shutdown.c')
-rw-r--r--source/rpc_parse/parse_shutdown.c123
1 files changed, 23 insertions, 100 deletions
diff --git a/source/rpc_parse/parse_shutdown.c b/source/rpc_parse/parse_shutdown.c
index 00daeaaaee7..ad2d6e1a028 100644
--- a/source/rpc_parse/parse_shutdown.c
+++ b/source/rpc_parse/parse_shutdown.c
@@ -2,7 +2,6 @@
* Unix SMB/CIFS implementation.
* RPC Pipe client / server routines
* Copyright (C) Jim McDonough (jmcd@us.ibm.com) 2003.
- * Copyright (C) Gerald (Jerry) Carter 2002-2005.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -31,11 +30,12 @@ Inits a structure.
void init_shutdown_q_init(SHUTDOWN_Q_INIT *q_s, const char *msg,
uint32 timeout, BOOL do_reboot, BOOL force)
{
- q_s->server = TALLOC_P( get_talloc_ctx(), uint16 );
- *q_s->server = 0x1;
+ q_s->ptr_server = 1;
+ q_s->server = 1;
+ q_s->ptr_msg = 1;
- q_s->message = TALLOC_P( get_talloc_ctx(), UNISTR4 );
- init_unistr4( q_s->message, msg, UNI_FLAGS_NONE );
+ init_unistr2(&q_s->uni_msg, msg, UNI_FLAGS_NONE);
+ init_uni_hdr(&q_s->hdr_msg, &q_s->uni_msg);
q_s->timeout = timeout;
@@ -44,29 +44,6 @@ void init_shutdown_q_init(SHUTDOWN_Q_INIT *q_s, const char *msg,
}
/*******************************************************************
-********************************************************************/
-
-void init_shutdown_q_init_ex(SHUTDOWN_Q_INIT_EX * q_u_ex, const char *msg,
- uint32 timeout, BOOL do_reboot, BOOL force, uint32 reason)
-{
- SHUTDOWN_Q_INIT q_u;
-
- ZERO_STRUCT( q_u );
-
- init_shutdown_q_init( &q_u, msg, timeout, do_reboot, force );
-
- /* steal memory */
-
- q_u_ex->server = q_u.server;
- q_u_ex->message = q_u.message;
-
- q_u_ex->reboot = q_u.reboot;
- q_u_ex->force = q_u.force;
-
- q_u_ex->reason = reason;
-}
-
-/*******************************************************************
reads or writes a structure.
********************************************************************/
@@ -82,119 +59,62 @@ BOOL shutdown_io_q_init(const char *desc, SHUTDOWN_Q_INIT *q_s, prs_struct *ps,
if (!prs_align(ps))
return False;
- if (!prs_pointer("server", ps, depth, (void**)&q_s->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
+ if (!prs_uint32("ptr_server", ps, depth, &(q_s->ptr_server)))
return False;
-
- if (!prs_pointer("message", ps, depth, (void**)&q_s->message, sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4))
+ if (!prs_uint16("server", ps, depth, &(q_s->server)))
return False;
if (!prs_align(ps))
return False;
-
- if (!prs_uint32("timeout", ps, depth, &(q_s->timeout)))
+ if (!prs_uint32("ptr_msg", ps, depth, &(q_s->ptr_msg)))
return False;
- if (!prs_uint8("force ", ps, depth, &(q_s->force)))
+ if (!smb_io_unihdr("hdr_msg", &(q_s->hdr_msg), ps, depth))
return False;
- if (!prs_uint8("reboot ", ps, depth, &(q_s->reboot)))
+ if (!smb_io_unistr2("uni_msg", &(q_s->uni_msg), q_s->hdr_msg.buffer, ps, depth))
return False;
-
-
- return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-BOOL shutdown_io_r_init(const char *desc, SHUTDOWN_R_INIT* r_s, prs_struct *ps,
- int depth)
-{
- if (r_s == NULL)
- return False;
-
- prs_debug(ps, depth, desc, "shutdown_io_r_init");
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!prs_werror("status", ps, depth, &r_s->status))
- return False;
-
- return True;
-}
-
-/*******************************************************************
-reads or writes a REG_Q_SHUTDOWN_EX structure.
-********************************************************************/
-
-BOOL shutdown_io_q_init_ex(const char *desc, SHUTDOWN_Q_INIT_EX * q_s, prs_struct *ps,
- int depth)
-{
- if (q_s == NULL)
- return False;
-
- prs_debug(ps, depth, desc, "shutdown_io_q_init_ex");
- depth++;
-
- if (!prs_align(ps))
- return False;
-
- if (!prs_pointer("server", ps, depth, (void**)&q_s->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
- return False;
-
- if (!prs_pointer("message", ps, depth, (void**)&q_s->message, sizeof(UNISTR4), (PRS_POINTER_CAST)prs_unistr4))
- return False;
-
if (!prs_align(ps))
return False;
if (!prs_uint32("timeout", ps, depth, &(q_s->timeout)))
return False;
-
if (!prs_uint8("force ", ps, depth, &(q_s->force)))
return False;
if (!prs_uint8("reboot ", ps, depth, &(q_s->reboot)))
return False;
- if (!prs_align(ps))
- return False;
- if (!prs_uint32("reason", ps, depth, &(q_s->reason)))
- return False;
-
-
return True;
}
/*******************************************************************
-reads or writes a REG_R_SHUTDOWN_EX structure.
+reads or writes a structure.
********************************************************************/
-BOOL shutdown_io_r_init_ex(const char *desc, SHUTDOWN_R_INIT_EX * r_s, prs_struct *ps,
- int depth)
+BOOL shutdown_io_r_init(const char *desc, SHUTDOWN_R_INIT* r_s, prs_struct *ps,
+ int depth)
{
if (r_s == NULL)
return False;
- prs_debug(ps, depth, desc, "shutdown_io_r_init_ex");
+ prs_debug(ps, depth, desc, "shutdown_io_r_init");
depth++;
if(!prs_align(ps))
return False;
- if(!prs_werror("status", ps, depth, &r_s->status))
+ if(!prs_ntstatus("status", ps, depth, &r_s->status))
return False;
return True;
}
-
/*******************************************************************
Inits a structure.
********************************************************************/
void init_shutdown_q_abort(SHUTDOWN_Q_ABORT *q_s)
{
- q_s->server = TALLOC_P( get_talloc_ctx(), uint16 );
- *q_s->server = 0x1;
+
+ q_s->ptr_server = 0;
+
}
/*******************************************************************
@@ -212,8 +132,11 @@ BOOL shutdown_io_q_abort(const char *desc, SHUTDOWN_Q_ABORT *q_s,
if (!prs_align(ps))
return False;
- if (!prs_pointer("server", ps, depth, (void**)&q_s->server, sizeof(uint16), (PRS_POINTER_CAST)prs_uint16))
+ if (!prs_uint32("ptr_server", ps, depth, &(q_s->ptr_server)))
return False;
+ if (q_s->ptr_server != 0)
+ if (!prs_uint16("server", ps, depth, &(q_s->server)))
+ return False;
return True;
}
@@ -233,7 +156,7 @@ BOOL shutdown_io_r_abort(const char *desc, SHUTDOWN_R_ABORT *r_s,
if (!prs_align(ps))
return False;
- if (!prs_werror("status", ps, depth, &r_s->status))
+ if (!prs_ntstatus("status", ps, depth, &r_s->status))
return False;
return True;