[SCM] Samba Shared Repository - branch master updated

[Douglas Bagnall]

The branch, master has been updated
       via  2fc855e7 samba-tool drs showrepl: do not crash if no dnsHostName found
      from  3efb458 dsdb: Add dsdb_request_has_control() helper function

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2fc855e7d2458249ca6fc8ffdf1d7633ab84cc55
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date:   Thu Oct 11 11:59:52 2018 +1300

    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 <douglas.bagnall at catalyst.net.nz>
    
    Autobuild-User(master): Douglas Bagnall <dbagnall at samba.org>
    Autobuild-Date(master): Fri Oct 12 15:27:07 CEST 2018 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 python/samba/netcmd/drs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/netcmd/drs.py b/python/samba/netcmd/drs.py
index 4641de0..0f7a243 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'])


-- 
Samba Shared Repository