From b3d2bb937dcebcfd35ac9be6706240bfe90f92fd Mon Sep 17 00:00:00 2001
From: Jeremy Ellington <jeremy@jeremye.net>
Date: Tue, 20 Jun 2006 19:48:53 +0000
Subject: [PATCH] Cleaned up return codes for invalid arguments passed to
 sub-commands.

---
 ipmitool/lib/ipmi_lanp.c |  1 +
 ipmitool/lib/ipmi_mc.c   |  6 +++++-
 ipmitool/lib/ipmi_pef.c  |  6 +++++-
 ipmitool/lib/ipmi_sol.c  |  2 +-
 ipmitool/lib/ipmi_user.c | 11 ++++++-----
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ipmitool/lib/ipmi_lanp.c b/ipmitool/lib/ipmi_lanp.c
index 1e3c84c..d2d81e2 100644
--- a/ipmitool/lib/ipmi_lanp.c
+++ b/ipmitool/lib/ipmi_lanp.c
@@ -2115,6 +2115,7 @@ ipmi_lanp_main(struct ipmi_intf * intf, int argc, char ** argv)
 	else
 	{
 		lprintf(LOG_NOTICE, "Invalid LAN command: %s", argv[0]);
+        rc = -1;
 	}
 	return rc;
 }
diff --git a/ipmitool/lib/ipmi_mc.c b/ipmitool/lib/ipmi_mc.c
index c135234..ac06ff8 100644
--- a/ipmitool/lib/ipmi_mc.c
+++ b/ipmitool/lib/ipmi_mc.c
@@ -564,9 +564,13 @@ ipmi_mc_main(struct ipmi_intf * intf, int argc, char ** argv)
 	else if (strncmp(argv[0], "setenables", 10) == 0) {
 		rc = ipmi_mc_set_enables(intf, argc-1, &(argv[1]));
 	}
-   else if (!strncmp(argv[0], "selftest", 8)) {
+    else if (!strncmp(argv[0], "selftest", 8)) {
 		rc = ipmi_mc_get_selftest(intf);
 	}
+    else {
+		lprintf(LOG_ERR, "Invalid mc/bmc command: %s", argv[0]);
+		rc = -1;
+	}
 
 	return rc;
 }
diff --git a/ipmitool/lib/ipmi_pef.c b/ipmitool/lib/ipmi_pef.c
index e95f6a5..3d3ff2f 100644
--- a/ipmitool/lib/ipmi_pef.c
+++ b/ipmitool/lib/ipmi_pef.c
@@ -845,6 +845,7 @@ int ipmi_pef_main(struct ipmi_intf * intf, int argc, char ** argv)
 	// PEF subcommand handling
 	*/
 	int help = 0;
+    int rc = 0;
 
 	if (!argc || !strncmp(argv[0], "info", 4))
 		ipmi_pef_get_info(intf);
@@ -858,11 +859,14 @@ int ipmi_pef_main(struct ipmi_intf * intf, int argc, char ** argv)
 		ipmi_pef_list_entries(intf);
 	else {
 		help = 1;
+        rc   = -1;
 		lprintf(LOG_ERR, "Invalid PEF command: '%s'\n", argv[0]);
 	}
+
 	if (help)
 		lprintf(LOG_NOTICE, "PEF commands: info status policy list");
 	else if (!verbose)
 		printf("\n");
-	return 0;
+
+	return rc;
 }
diff --git a/ipmitool/lib/ipmi_sol.c b/ipmitool/lib/ipmi_sol.c
index b3328c9..3644124 100644
--- a/ipmitool/lib/ipmi_sol.c
+++ b/ipmitool/lib/ipmi_sol.c
@@ -1106,7 +1106,7 @@ ipmi_sol_deactivate(struct ipmi_intf * intf)
 	struct ipmi_rq   req;
 	uint8_t    data[6];	 
 
-   memset(&req, 0, sizeof(req));
+    memset(&req, 0, sizeof(req));
 	req.msg.netfn    = IPMI_NETFN_APP;
 	req.msg.cmd      = IPMI_DEACTIVATE_PAYLOAD;
 	req.msg.data_len = 6;
diff --git a/ipmitool/lib/ipmi_user.c b/ipmitool/lib/ipmi_user.c
index cd366d7..cacc767 100644
--- a/ipmitool/lib/ipmi_user.c
+++ b/ipmitool/lib/ipmi_user.c
@@ -815,12 +815,13 @@ ipmi_user_main(struct ipmi_intf * intf, int argc, char ** argv)
 						0); /* This field is ignored */
 	}
 	
-
+    else
+    {
+        retval = -1;
+        lprintf(LOG_ERR, "Invalid user command: '%s'\n", argv[0]);
+        print_user_usage();
+    }
     
-	else
-	{
-		print_user_usage();
-	}
 
 	return retval;
 }