diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2014-08-30 01:57:26 +0200 |
|---|---|---|
| committer | David Disseldorp <ddiss@samba.org> | 2014-08-31 21:21:13 +0200 |
| commit | fdbd6efa13ee058487c5062b59176e48190889ef (patch) | |
| tree | 6bc269224109ccb6468f521cdb53c872fde301dc /python/samba/netcmd/domain.py | |
| parent | 2440845acebff3a59ebb54d0ef8cdab39bf71962 (diff) | |
| download | samba-fdbd6efa13ee058487c5062b59176e48190889ef.tar.gz samba-fdbd6efa13ee058487c5062b59176e48190889ef.tar.xz samba-fdbd6efa13ee058487c5062b59176e48190889ef.zip | |
samba.netcmd.domain: Just catch ImportError, not any parsing errors in cmd_domain_export_keytab.
Change-Id: If5710565c74e87fe218a83f31cddcf64605e522e
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Diffstat (limited to 'python/samba/netcmd/domain.py')
| -rw-r--r-- | python/samba/netcmd/domain.py | 5 |
1 files changed, 3 insertions, 2 deletions
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): |