From 34174a32904737139be8c7fdfd3d660c2a20708c Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Fri, 19 Feb 2021 14:34:32 -0500
Subject: [PATCH] Print relevant help if no/partial command passed

---
 salt/common/tools/sbin/so-rules | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/salt/common/tools/sbin/so-rules b/salt/common/tools/sbin/so-rules
index 0406eb67a..ee9857bff 100644
--- a/salt/common/tools/sbin/so-rules
+++ b/salt/common/tools/sbin/so-rules
@@ -361,7 +361,7 @@ def main():
       modify              Manage and list modified rules (add, remove, list)
     """
   )
-  subparsers = main_parser.add_subparsers(title='commands', description=subcommand_desc, metavar='')
+  subparsers = main_parser.add_subparsers(title='commands', description=subcommand_desc, metavar='', dest='command')
 
 
   # Disabled actions
@@ -424,7 +424,21 @@ def main():
 
   args.pillar = find_minion_pillar(args.minion_id)
   
+
+  if hasattr(args, 'func'):
   exit_code = args.func(args)
+  else:
+    if args.command is None:
+      main_parser.print_help()
+    else:
+      if args.command == 'disabled':
+        disabled.print_help()
+      elif args.command == 'enabled':
+        enabled.print_help()
+      elif args.command == 'modify':
+        modify.print_help()
+    sys.exit(0)
+  
   if isinstance(exit_code, subprocess.CompletedProcess):
     sys.exit(exit_code.returncode)
   else: