diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-01-04 07:50:04 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-01-04 07:50:04 +0000 |
| commit | b327f5ba53788f6ef758af57a8845a44abba69d3 (patch) | |
| tree | 02d7184416f83a2a2d71162c0fb143a3f3c3da80 /source3/utils/net_rpc.c | |
| parent | 5714c1e0b0e09050d38e917b9c5d9988b818128d (diff) | |
| download | samba-b327f5ba53788f6ef758af57a8845a44abba69d3.tar.gz samba-b327f5ba53788f6ef758af57a8845a44abba69d3.tar.bz2 samba-b327f5ba53788f6ef758af57a8845a44abba69d3.zip | |
Merge from HEAD - idra's fix for the fact that the shutdown command takes two 1
byte boolean flags, not a 16 bit bitmask.
Andrew Bartlett
(This used to be commit a4f7777ca08c732ace2ba60bc0ecffbea1239fc3)
Diffstat (limited to 'source3/utils/net_rpc.c')
| -rw-r--r-- | source3/utils/net_rpc.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index e0390a1afb..60adcfdf6e 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -1444,9 +1444,6 @@ static NTSTATUS rpc_shutdown_internals(const DOM_SID *domain_sid, struct cli_sta NTSTATUS result = NT_STATUS_UNSUCCESSFUL; const char *msg = "This machine will be shutdown shortly"; uint32 timeout = 20; - uint16 flgs = 0; - BOOL reboot = opt_reboot; - BOOL force = opt_force; #if 0 poptContext pc; int rc; @@ -1472,12 +1469,6 @@ static NTSTATUS rpc_shutdown_internals(const DOM_SID *domain_sid, struct cli_sta return NT_STATUS_INVALID_PARAMETER; } #endif - if (reboot) { - flgs |= REG_REBOOT_ON_SHUTDOWN; - } - if (force) { - flgs |= REG_FORCE_SHUTDOWN; - } if (opt_comment) { msg = opt_comment; } @@ -1486,7 +1477,7 @@ static NTSTATUS rpc_shutdown_internals(const DOM_SID *domain_sid, struct cli_sta } /* create an entry */ - result = cli_reg_shutdown(cli, mem_ctx, msg, timeout, flgs); + result = cli_reg_shutdown(cli, mem_ctx, msg, timeout, opt_reboot, opt_force); if (NT_STATUS_IS_OK(result)) DEBUG(5,("Shutdown of remote machine succeeded\n")); |