diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2001-12-30 10:19:56 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2001-12-30 10:19:56 +0000 |
| commit | 72898d48212c0af7d76620521f4b961f7afe11b2 (patch) | |
| tree | 647b30e0c9bbe3716792c5efbf6f88e3624881d0 /source3 | |
| parent | f399e17542f7e4e4c0878cf76d587bbcfc6ee418 (diff) | |
| download | samba-72898d48212c0af7d76620521f4b961f7afe11b2.tar.gz samba-72898d48212c0af7d76620521f4b961f7afe11b2.tar.bz2 samba-72898d48212c0af7d76620521f4b961f7afe11b2.zip | |
Finish idra's cleanup of the RPC remote shutdown code.
(This used to be commit 79031b68ce6bdf882d9c9bd4f3310f597e0c1fda)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/libsmb/cli_reg.c | 5 | ||||
| -rw-r--r-- | source3/rpcclient/cmd_reg.c | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/source3/libsmb/cli_reg.c b/source3/libsmb/cli_reg.c index 73eea58cb7..948534c29b 100644 --- a/source3/libsmb/cli_reg.c +++ b/source3/libsmb/cli_reg.c @@ -38,7 +38,7 @@ struct cli_state *cli_winreg_initialise(struct cli_state *cli, /* Shutdown a server */ NTSTATUS cli_reg_shutdown(struct cli_state * cli, TALLOC_CTX *mem_ctx, - const char *srv_name, const char *msg, + const char *msg, uint32 timeout, uint16 flags) { prs_struct qbuf; @@ -78,8 +78,7 @@ done: /* Abort a server shutdown */ -NTSTATUS cli_reg_abort_shutdown(struct cli_state * cli, TALLOC_CTX *mem_ctx, - const char *srv_name) +NTSTATUS cli_reg_abort_shutdown(struct cli_state * cli, TALLOC_CTX *mem_ctx) { prs_struct rbuf; prs_struct qbuf; diff --git a/source3/rpcclient/cmd_reg.c b/source3/rpcclient/cmd_reg.c index 22a420a27e..787cd4f553 100644 --- a/source3/rpcclient/cmd_reg.c +++ b/source3/rpcclient/cmd_reg.c @@ -903,7 +903,6 @@ static NTSTATUS cmd_reg_shutdown(struct cli_state *cli, TALLOC_CTX *mem_ctx, uint32 timeout = 20; uint16 flgs = 0; int opt; - int ret; *msg = 0; optind = 0; /* TODO: test if this hack works on other systems too --simo */ @@ -940,7 +939,7 @@ static NTSTATUS cmd_reg_shutdown(struct cli_state *cli, TALLOC_CTX *mem_ctx, } /* create an entry */ - result = cli_reg_shutdown(cli, mem_ctx, srv_name, msg, timeout, flgs); + result = cli_reg_shutdown(cli, mem_ctx, msg, timeout, flgs); if (NT_STATUS_IS_OK(result)) DEBUG(5,("cmd_reg_shutdown: query succeeded\n")); @@ -958,9 +957,8 @@ static NTSTATUS cmd_reg_abort_shutdown(struct cli_state *cli, char **argv) { NTSTATUS result = NT_STATUS_UNSUCCESSFUL; - int ret; - result = cli_reg_abort_shutdown(cli, mem_ctx, srv_name); + result = cli_reg_abort_shutdown(cli, mem_ctx); if (NT_STATUS_IS_OK(result)) DEBUG(5,("cmd_reg_abort_shutdown: query succeeded\n")); |