From: Noel Power <noel.power@suse.com>
Date: Mon, 27 Aug 2018 19:29:53 +0000 (+0100)
Subject: s4/scripting: Py2/Py3 for samba4.blackbox.upgradeprovision.alpha13
X-Git-Tag: tdb-1.3.17~1235
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f94a81379666db7145ae0495bf16fb4f95c6cb31;p=thirdparty%2Fsamba.git

s4/scripting: Py2/Py3 for samba4.blackbox.upgradeprovision.alpha13

fixup source4/scripting/bin/samba_upgradedns
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source4/scripting/bin/samba_upgradedns b/source4/scripting/bin/samba_upgradedns
index e29ba7092b5..6eb7f823a50 100755
--- a/source4/scripting/bin/samba_upgradedns
+++ b/source4/scripting/bin/samba_upgradedns
@@ -401,16 +401,17 @@ if __name__ == '__main__':
         ncs = msg.get("msDS-hasMasterNCs")
         if ncs:
             for nc in ncs:
-                master_nclist.append(nc)
+                master_nclist.append(str(nc))
 
         partial_nclist = []
         ncs = msg.get("hasPartialReplicaNCs")
         if ncs:
             for nc in ncs:
-                partial_nclist.append(nc)
+                partial_nclist.append(str(nc))
 
         modified_master = False
         modified_partial = False
+
         for nc in dns_nclist:
             if nc not in master_nclist:
                 master_nclist.append(nc)
@@ -519,7 +520,7 @@ if __name__ == '__main__':
                         logger.info("Failed to chown %s to bind gid %u",
                                     paths.binddns_dir, paths.bind_gid)
                 try:
-                    os.chmod(bind_dns_keytab_path, 0640)
+                    os.chmod(bind_dns_keytab_path, 0o640)
                     os.chown(bind_dns_keytab_path, -1, paths.bind_gid)
                 except OSError:
                     if not os.environ.has_key('SAMBA_SELFTEST'):