From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Wed, 7 Sep 2022 22:17:54 +0000 (+1200)
Subject: samba-tool: binary uses samba_tool function
X-Git-Tag: talloc-2.4.0~1119
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4bfcd16a3c6af3fc21d9c57f8fbdb2ea5fd15f25;p=thirdparty%2Fsamba.git

samba-tool: binary uses samba_tool function

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source4/scripting/bin/samba-tool b/source4/scripting/bin/samba-tool
index c4e672e3798..b02ad4d0ef7 100755
--- a/source4/scripting/bin/samba-tool
+++ b/source4/scripting/bin/samba-tool
@@ -30,15 +30,7 @@ sys.path.insert(0, "bin/python")
 import signal
 signal.signal(signal.SIGINT, signal.SIG_DFL)
 
-from samba.netcmd.main import cmd_sambatool
-samba_tool = cmd_sambatool()
+from samba.netcmd.main import samba_tool
 
-try:
-    command, args = samba_tool._resolve("samba-tool", *sys.argv[1:])
-    retval = command._run(*args)
-except SystemExit as e:
-    retval = e.code
-except Exception as e:
-    command.show_command_error(e)
-    retval = 1
+retval = samba_tool(*sys.argv[1:])
 sys.exit(retval)