[PATCH 1/5] samba.netcmd.domain: Just catch ImportError, not any parsing errors in cmd_domain_export_keytab.
Jelmer Vernooij
jelmer at samba.org
Fri Aug 29 17:57:26 MDT 2014
Change-Id: If5710565c74e87fe218a83f31cddcf64605e522e
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
---
python/samba/netcmd/domain.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index 2e7a9c7..9a06f5f 100644
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -83,6 +83,9 @@ def get_testparm_var(testparm, smbconf, varname):
try:
import samba.dckeytab
+except ImportError:
+ cmd_domain_export_keytab = None
+else:
class cmd_domain_export_keytab(Command):
"""Dump Kerberos keys of the domain into a keytab."""
@@ -104,8 +107,6 @@ try:
lp = sambaopts.get_loadparm()
net = Net(None, lp)
net.export_keytab(keytab=keytab, principal=principal)
-except:
- cmd_domain_export_keytab = None
class cmd_domain_info(Command):
--
2.1.0
More information about the samba-technical
mailing list