samba-tool drs showrepl: do not crash if no dnsHostName found
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Wed, 10 Oct 2018 22:59:52 +0000 (11:59 +1300)
committerKarolin Seeger <kseeger@samba.org>
Wed, 9 Jan 2019 08:37:19 +0000 (09:37 +0100)
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 <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Douglas Bagnall <dbagnall@samba.org>
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

index b8793b7660695d3c906542468c6250eac307bf03..a751cbb635aa01b5f71adb6569596e5498369c05 100644 (file)
@@ -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'])