From: Douglas Bagnall Date: Wed, 10 Oct 2018 22:59:52 +0000 (+1300) Subject: samba-tool drs showrepl: do not crash if no dnsHostName found X-Git-Tag: tdb-1.3.17~1317 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fc855e7d2458249ca6fc8ffdf1d7633ab84cc55;p=thirdparty%2Fsamba.git samba-tool drs showrepl: do not crash if no dnsHostName found This should not happen, but it does sometimes in an autobuild environment. Rather than reporting this by crashing, we report it by showing there is no DNS name. Signed-off-by: Douglas Bagnall Autobuild-User(master): Douglas Bagnall Autobuild-Date(master): Fri Oct 12 15:27:07 CEST 2018 on sn-devel-144 --- diff --git a/python/samba/netcmd/drs.py b/python/samba/netcmd/drs.py index 4641de06146..0f7a243912d 100644 --- a/python/samba/netcmd/drs.py +++ b/python/samba/netcmd/drs.py @@ -301,7 +301,7 @@ class cmd_drs_showrepl(Command): (errno, _) = e.args if errno == ldb.ERR_NO_SUCH_OBJECT: d['is deleted'] = True - except KeyError: + except (KeyError, IndexError): pass d['replicates NC'] = [] @@ -359,7 +359,7 @@ class cmd_drs_showrepl(Command): self.message("\tConnection name: %s" % d['name']) self.message("\tEnabled : %s" % str(d['enabled']).upper()) - self.message("\tServer DNS name : %s" % d['dns name']) + self.message("\tServer DNS name : %s" % d.get('dns name')) self.message("\tServer DN name : %s" % d['remote DN']) self.message("\t\tTransportType: RPC") self.message("\t\toptions: 0x%08X" % d['options'])