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 <metze@samba.org>

diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py
index 4006a41eb0d3b2a76e0e9dcc30ca9d60b932e9c7..a41a9d67345bfbb89517981d5bef54b151ae1555 100644 (file)
--- 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 + "'!")