[PATCH] miscellaneous patches

[Douglas Bagnall]

On 04/05/18 14:37, Douglas Bagnall via samba-technical wrote:
> On 04/05/18 14:21, Gary Lockyer via samba-technical wrote:
>> Indeed it was
>> RB+
> 
> Aha! That was the gateway drug. Try some more!
> These are the tiniest bit more exciting.

but wait, there's more!


-------------- next part --------------
From d05b39c5940a0a8d3a653b5a5cd0d815e2f26144 Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Fri, 4 May 2018 15:17:43 +1200
Subject: [PATCH 1/3] traffic emulation: use py3-compatible .__next__(), not
 .next()

Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
 python/samba/emulate/traffic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/samba/emulate/traffic.py b/python/samba/emulate/traffic.py
index 9d95e3a14d5..68cf702982f 100644
--- a/python/samba/emulate/traffic.py
+++ b/python/samba/emulate/traffic.py
@@ -331,7 +331,7 @@ class ReplayContext(object):
         self.last_netlogon_bad        = False
         self.last_samlogon_bad        = False
         self.generate_ldap_search_tables()
-        self.next_conversation_id = itertools.count().next
+        self.next_conversation_id = itertools.count().__next__
 
     def generate_ldap_search_tables(self):
         session = system_session()
-- 
2.14.1


From 85ae3a2391b38f1cd2126f16a80ae00476aed113 Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Fri, 4 May 2018 15:20:06 +1200
Subject: [PATCH 2/3] rodc_rwdc tests: use py3-compatible .__next__(), not
 .next()

It is almost as if python is trying to tell us not to do this.

Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
 source4/dsdb/tests/python/rodc_rwdc.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source4/dsdb/tests/python/rodc_rwdc.py b/source4/dsdb/tests/python/rodc_rwdc.py
index 2f4400e3e16..0a9a456e041 100644
--- a/source4/dsdb/tests/python/rodc_rwdc.py
+++ b/source4/dsdb/tests/python/rodc_rwdc.py
@@ -114,7 +114,7 @@ def get_server_ref_from_samdb(samdb):
     return res[0]['serverReference'][0]
 
 class RodcRwdcCachedTests(password_lockout_base.BasePasswordTestCase):
-    counter = itertools.count(1).next
+    counter = itertools.count(1).__next__
 
     def _check_account_initial(self, dn):
         self.force_replication()
@@ -701,7 +701,7 @@ class RodcRwdcCachedTests(password_lockout_base.BasePasswordTestCase):
                                   msDSUserAccountControlComputed=0)
 
 class RodcRwdcTests(password_lockout_base.BasePasswordTestCase):
-    counter = itertools.count(1).next
+    counter = itertools.count(1).__next__
 
     def force_replication(self, base=None):
         if base is None:
-- 
2.14.1


From 734d4c77b61526c05355aba221234a8cf05bd2cd Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Fri, 4 May 2018 15:26:47 +1200
Subject: [PATCH 3/3] autobuild: add compiler version to results tarball

Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
---
 script/autobuild.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/autobuild.py b/script/autobuild.py
index 0ac65f138f1..5a7b7bc32c8 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -520,7 +520,7 @@ class buildlist(object):
     def write_system_info(self):
         filename = 'system-info.txt'
         f = open(filename, 'w')
-        for cmd in ['uname -a', 'free', 'cat /proc/cpuinfo']:
+        for cmd in ['uname -a', 'free', 'cat /proc/cpuinfo', 'cc --version']:
             print('### %s' % cmd, file=f)
             print(run_cmd(cmd, output=True, checkfail=False), file=f)
             print(file=f)
-- 
2.14.1