From f57f009bc600e214cf34de2ef825fe51eb25aeed Mon Sep 17 00:00:00 2001 From: =?utf8?q?Matthias=20Dieter=20Walln=C3=B6fer?= Date: Wed, 23 Nov 2011 21:29:18 +0100 Subject: [PATCH] samba-tool: domain info - add basic exception handling It is nicer to get an error message rather than a stacktrace on wrong IP addresses. Signed-off-by: Stefan Metzmacher --- source4/scripting/python/samba/netcmd/domain.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py index 4006a41eb0d..a41a9d67345 100644 --- a/source4/scripting/python/samba/netcmd/domain.py +++ b/source4/scripting/python/samba/netcmd/domain.py @@ -87,8 +87,8 @@ class cmd_domain_info(Command): def run(self, address, credopts=None, sambaopts=None, versionopts=None): lp = sambaopts.get_loadparm() - res = netcmd_get_domain_infos_via_cldap(lp, None, address) - if res: + try: + res = netcmd_get_domain_infos_via_cldap(lp, None, address) print "Forest : %s" % res.forest print "Domain : %s" % res.dns_domain print "Netbios domain : %s" % res.domain_name @@ -96,6 +96,8 @@ class cmd_domain_info(Command): print "DC netbios name : %s" % res.pdc_name print "Server site : %s" % res.server_site print "Client site : %s" % res.client_site + except RuntimeError: + raise CommandError("Invalid IP address '" + address + "'!") -- 2.34.1