]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
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)
committerDouglas Bagnall <dbagnall@samba.org>
Fri, 12 Oct 2018 13:27:07 +0000 (15:27 +0200)
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 <douglas.bagnall@catalyst.net.nz>
Autobuild-User(master): Douglas Bagnall <dbagnall@samba.org>
Autobuild-Date(master): Fri Oct 12 15:27:07 CEST 2018 on sn-devel-144

python/samba/netcmd/drs.py

index 4641de061469630ca619e201106c2e2e524ac23a..0f7a243912d2531814bd9e3fde3c3040f54b0924 100644 (file)
@@ -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'])