From fdbd6efa13ee058487c5062b59176e48190889ef Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 30 Aug 2014 01:57:26 +0200 Subject: samba.netcmd.domain: Just catch ImportError, not any parsing errors in cmd_domain_export_keytab. Change-Id: If5710565c74e87fe218a83f31cddcf64605e522e Signed-Off-By: Jelmer Vernooij Reviewed-by: David Disseldorp --- python/samba/netcmd/domain.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'python') diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index 2e7a9c79c6..9a06f5f01d 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): -- cgit