From 2109e43ff96ff185e155dfeaad4481d591f25ed5 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Thu, 11 Oct 2018 11:59:52 +1300 Subject: [PATCH] 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. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13716 Signed-off-by: Douglas Bagnall Reviewed-by: Andrew Bartlett Autobuild-User(master): Douglas Bagnall Autobuild-Date(master): Fri Oct 12 15:27:07 CEST 2018 on sn-devel-144 (cherry picked from commit 2fc855e7d2458249ca6fc8ffdf1d7633ab84cc55) --- python/samba/netcmd/drs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/samba/netcmd/drs.py b/python/samba/netcmd/drs.py index b8793b76606..a751cbb635a 100644 --- a/python/samba/netcmd/drs.py +++ b/python/samba/netcmd/drs.py @@ -302,7 +302,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'] = [] @@ -360,7 +360,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']) -- 2.11.0