diff options
author | Jeremy Allison <jra@samba.org> | 2007-04-29 21:13:13 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:46 -0500 |
commit | 138668d5d284f7d2496f22c16a99be107cdfc872 (patch) | |
tree | 9bd5fb94a64173bd6a9325a1ecfc7bb4ccf34129 /source3/rpc_parse/parse_svcctl.c | |
parent | 571845991e137eb5f166d54c59a9e7efc1d565af (diff) | |
download | samba-138668d5d284f7d2496f22c16a99be107cdfc872.tar.gz samba-138668d5d284f7d2496f22c16a99be107cdfc872.tar.bz2 samba-138668d5d284f7d2496f22c16a99be107cdfc872.zip |
r22577: Change all of parse/*.c to use standard form. Fix some
marshalling bugs.
Jeremy.
(This used to be commit 3df99006f8a52af7cff0fbca1bf16157a8648254)
Diffstat (limited to 'source3/rpc_parse/parse_svcctl.c')
-rw-r--r-- | source3/rpc_parse/parse_svcctl.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source3/rpc_parse/parse_svcctl.c b/source3/rpc_parse/parse_svcctl.c index dc4ee3e6e9..3846812f31 100644 --- a/source3/rpc_parse/parse_svcctl.c +++ b/source3/rpc_parse/parse_svcctl.c @@ -829,10 +829,14 @@ BOOL svcctl_io_service_fa( const char *desc, SERVICE_FAILURE_ACTIONS *fa, RPC_BU if ( !prs_uint32("num_actions", ps, depth, &fa->num_actions) ) return False; - if ( UNMARSHALLING(ps) && fa->num_actions ) { - if ( !(fa->actions = TALLOC_ARRAY( get_talloc_ctx(), SC_ACTION, fa->num_actions )) ) { - DEBUG(0,("svcctl_io_service_fa: talloc() failure!\n")); - return False; + if ( UNMARSHALLING(ps)) { + if (fa->num_actions) { + if ( !(fa->actions = TALLOC_ARRAY( get_talloc_ctx(), SC_ACTION, fa->num_actions )) ) { + DEBUG(0,("svcctl_io_service_fa: talloc() failure!\n")); + return False; + } + } else { + fa->actions = NULL; } } |