From b327f5ba53788f6ef758af57a8845a44abba69d3 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 4 Jan 2003 07:50:04 +0000
Subject: 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)
---
 source3/rpcclient/cmd_reg.c | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

(limited to 'source3/rpcclient/cmd_reg.c')

diff --git a/source3/rpcclient/cmd_reg.c b/source3/rpcclient/cmd_reg.c
index e0a3201aa9..5d29b4c51a 100644
--- a/source3/rpcclient/cmd_reg.c
+++ b/source3/rpcclient/cmd_reg.c
@@ -900,7 +900,8 @@ static NTSTATUS cmd_reg_shutdown(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	fstring msg;
 	uint32 timeout = 20;
-	uint16 flgs = 0;
+	BOOL force = False;
+	BOOL reboot = False;
 	int opt;
 
 	*msg = 0;
@@ -908,37 +909,33 @@ static NTSTATUS cmd_reg_shutdown(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
 	while ((opt = getopt(argc, argv, "m:t:rf")) != EOF)
 	{
-		fprintf (stderr, "[%s]\n", argv[argc-1]);
+		/*fprintf (stderr, "[%s]\n", argv[argc-1]);*/
 	
 		switch (opt)
 		{
 			case 'm':
-			{
 				safe_strcpy(msg, optarg, sizeof(msg)-1);
-				fprintf (stderr, "[%s|%s]\n", optarg, msg);
+				/*fprintf (stderr, "[%s|%s]\n", optarg, msg);*/
 				break;
-			}
+
 			case 't':
-			{
 				timeout = atoi(optarg);
-				fprintf (stderr, "[%s|%d]\n", optarg, timeout);
-			break;
-			}
+				/*fprintf (stderr, "[%s|%d]\n", optarg, timeout);*/
+				break;
+
 			case 'r':
-			{
-				flgs |= 0x100;
-			break;
-			}
+				reboot = True;
+				break;
+
 			case 'f':
-			{
-				flgs |= 0x001;
+				force = True;
 				break;
-			}
+
 		}
 	}
 
 	/* create an entry */
-	result = cli_reg_shutdown(cli, mem_ctx, msg, timeout, flgs);
+	result = cli_reg_shutdown(cli, mem_ctx, msg, timeout, reboot, force);
 
 	if (NT_STATUS_IS_OK(result))
 		DEBUG(5,("cmd_reg_shutdown: query succeeded\n"));
@@ -974,10 +971,10 @@ struct cmd_set reg_commands[] = {
 	{ "REG"  },
 
 	{ "shutdown",		cmd_reg_shutdown,		PI_WINREG, "Remote Shutdown",
-				"[-m message] [-t timeout] [-r] [-f] (-r == reboot, -f == force)" },
+				"syntax: shutdown [-m message] [-t timeout] [-r] [-h] [-f] (-r == reboot, -h == halt, -f == force)" },
 				
 	{ "abortshutdown",	cmd_reg_abort_shutdown,		PI_WINREG, "Abort Shutdown",
-				"" },				
+				"syntax: abortshutdown" },
 /*
 	{ "regenum",		cmd_reg_enum,			"Registry Enumeration",
 				"<keyname>" },
-- 
cgit