From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 10 Mar 2024 22:14:17 +0000 (+1300)
Subject: samba-tool domain exportkeytab: Raise a proper CommandError
X-Git-Tag: tdb-1.4.11~1449
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2dff1736666568f304f8ae67796ecb1e768f38b;p=thirdparty%2Fsamba.git

samba-tool domain exportkeytab: Raise a proper CommandError

This avoids giving just a backtrace for things like exporting a keytab
to an existing file.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jo Sutton <josutton@catalyst.net.nz>
---

diff --git a/python/samba/netcmd/domain/keytab.py b/python/samba/netcmd/domain/keytab.py
index 5c2419b0485..0136a11436f 100644
--- a/python/samba/netcmd/domain/keytab.py
+++ b/python/samba/netcmd/domain/keytab.py
@@ -23,9 +23,9 @@
 #
 
 import samba.getopt as options
-from samba import enable_net_export_keytab
+from samba import enable_net_export_keytab, NTSTATUSError
 from samba.net import Net
-from samba.netcmd import Command, Option
+from samba.netcmd import Command, CommandError, Option
 
 try:
     enable_net_export_keytab()
@@ -62,7 +62,10 @@ else:
             lp = sambaopts.get_loadparm()
             net = Net(None, lp)
             samdb = self.ldb_connect(hostopts, sambaopts, credopts)
-            net.export_keytab(samdb=samdb,
-                              keytab=keytab,
-                              principal=principal,
-                              keep_stale_entries=keep_stale_entries)
+            try:
+                net.export_keytab(samdb=samdb,
+                                  keytab=keytab,
+                                  principal=principal,
+                                  keep_stale_entries=keep_stale_entries)
+            except NTSTATUSError as error:
+                raise CommandError(f"Failed to export domain keys into keytab {keytab}: {error.args[1]}")