Allow normal users to run help, export, list, and show
Fixes bug #6967
---
src/bin/secstate | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/bin/secstate b/src/bin/secstate
index f658dc9..01a9f0a 100644
--- a/src/bin/secstate
+++ b/src/bin/secstate
@@ -52,9 +52,6 @@ Sub-commands:
sec_instance = secstate.Secstate(CONFIG_FILE)
def main():
- if os.geteuid() != 0:
- sys.stderr.write("secstate must be run as root!\n")
- return -1
try:
subcommand = sys.argv[1]
@@ -77,12 +74,25 @@ def main():
if subcommand == 'help':
return help(sys.argv[arg_num:])
- if subcommand == 'import':
- return import_content(sys.argv[arg_num:])
-
elif subcommand == 'export':
return export(sys.argv[arg_num:])
+ elif subcommand == 'search':
+ return search(sys.argv[arg_num:])
+
+ elif subcommand == 'list':
+ return list_content(sys.argv[arg_num:])
+
+ elif subcommand == 'show':
+ return show(sys.argv[arg_num:])
+
+ elif os.geteuid() != 0:
+ sys.stderr.write("secstate must be run as root!\n")
+ return -1
+
+ elif subcommand == 'import':
+ return import_content(sys.argv[arg_num:])
+
elif subcommand == 'remove':
return remove_content(sys.argv[arg_num:])
@@ -94,16 +104,7 @@ def main():
elif subcommand == 'audit':
return audit(sys.argv[arg_num:])
-
- elif subcommand == 'search':
- return search(sys.argv[arg_num:])
-
- elif subcommand == 'list':
- return list_content(sys.argv[arg_num:])
-
- elif subcommand == 'show':
- return show(sys.argv[arg_num:])
-
+
elif subcommand == 'remediate':
return remediate(sys.argv[arg_num:])
--
1.7.2.2
Show replies by date