[SCM] Samba Shared Repository - branch master updated

[Garming Sam]

The branch, master has been updated
       via  ddc0593 samba_upgradedns: Check for both accounts in BIND_DLZ upgrade
      from  3869663 Removed upgrading-samba4.txt

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


- Log -----------------------------------------------------------------
commit ddc059397d14ea11dfac1caa4d1b23288fdd1ee8
Author: Garming Sam <garming at samba.org>
Date:   Tue Jul 26 11:13:56 2016 +0200

    samba_upgradedns: Check for both accounts in BIND_DLZ upgrade
    
    Signed-off-by: Garming Sam <garming at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10882
    
    Autobuild-User(master): Garming Sam <garming at samba.org>
    Autobuild-Date(master): Mon Aug 29 08:53:14 CEST 2016 on sn-devel-144

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

Summary of changes:
 source4/scripting/bin/samba_upgradedns | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/bin/samba_upgradedns b/source4/scripting/bin/samba_upgradedns
index 5963712..d00b67d 100755
--- a/source4/scripting/bin/samba_upgradedns
+++ b/source4/scripting/bin/samba_upgradedns
@@ -413,13 +413,17 @@ if __name__ == '__main__':
     if opts.dns_backend == "BIND9_DLZ":
         # Check if dns-HOSTNAME account exists and create it if required
         secrets_msgs = ldbs.secrets.search(expression='(samAccountName=dns-%s)' % hostname, attrs=['secret'])
-        if len(secrets_msgs) == 0:
+        msg = ldbs.sam.search(base=domaindn, scope=ldb.SCOPE_DEFAULT,
+                              expression='(sAMAccountName=dns-%s)' % (hostname),
+                              attrs=[])
 
+        if len(secrets_msgs) == 0 or len(msg) == 0:
             logger.info("Adding dns-%s account" % hostname)
 
-            msg = ldbs.sam.search(base=domaindn, scope=ldb.SCOPE_DEFAULT,
-                                  expression='(sAMAccountName=dns-%s)' % (hostname),
-                                  attrs=[])
+            if len(secrets_msgs) == 1:
+                dn = secrets_msgs[0].dn
+                ldbs.secrets.delete(dn)
+
             if len(msg) == 1:
                 dn = msg[0].dn
                 ldbs.sam.delete(dn)


-- 
Samba Shared Repository