[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Fri Jun 9 07:51:03 UTC 2017
The branch, master has been updated
via 7bce7e1 samba tool - tests: Fix shell metacharacters in generated password
via 0098a7b provision: Update root DNS servers list
from 1828011 tevent: Fix a race condition in tevent context rundown
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7bce7e150e2ae9adc3e372d65e152062e291cf19
Author: Gary Lockyer <gary at catalyst.net.nz>
Date: Thu Jun 8 07:21:05 2017 +1200
samba tool - tests: Fix shell metacharacters in generated password
Restrict the random password to [A-Za-z0-9] to ensure there are no shell
metacharacters in the generated password.
The tests use "samba-tool user create" to create the test user.
Occasionally the generated password contained shell metachatacters and
the command failed.
Signed-off-by: Gary Lockyer <gary at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Fri Jun 9 09:50:28 CEST 2017 on sn-devel-144
commit 0098a7b5564b60b3b29d3f1767adfd538d3ff55d
Author: Amitay Isaacs <amitay at gmail.com>
Date: Thu Jun 8 22:59:56 2017 +1000
provision: Update root DNS servers list
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
python/samba/provision/sambadns.py | 14 +++++++++++---
python/samba/tests/samba_tool/user_virtualCryptSHA.py | 12 +++++++++---
python/samba/tests/samba_tool/user_wdigest.py | 8 +++++++-
3 files changed, 27 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py
index 2c69dd4..961f37e 100644
--- a/python/samba/provision/sambadns.py
+++ b/python/samba/provision/sambadns.py
@@ -317,15 +317,16 @@ def add_dns_container(samdb, domaindn, prefix, domain_sid, dnsadmins_sid, forest
def add_rootservers(samdb, domaindn, prefix):
+ # https://www.internic.net/zones/named.root
rootservers = {}
rootservers["a.root-servers.net"] = "198.41.0.4"
rootservers["b.root-servers.net"] = "192.228.79.201"
rootservers["c.root-servers.net"] = "192.33.4.12"
- rootservers["d.root-servers.net"] = "128.8.10.90"
+ rootservers["d.root-servers.net"] = "199.7.91.13"
rootservers["e.root-servers.net"] = "192.203.230.10"
rootservers["f.root-servers.net"] = "192.5.5.241"
rootservers["g.root-servers.net"] = "192.112.36.4"
- rootservers["h.root-servers.net"] = "128.63.2.53"
+ rootservers["h.root-servers.net"] = "198.97.190.53"
rootservers["i.root-servers.net"] = "192.36.148.17"
rootservers["j.root-servers.net"] = "192.58.128.30"
rootservers["k.root-servers.net"] = "193.0.14.129"
@@ -334,10 +335,17 @@ def add_rootservers(samdb, domaindn, prefix):
rootservers_v6 = {}
rootservers_v6["a.root-servers.net"] = "2001:503:ba3e::2:30"
+ rootservers_v6["b.root-servers.net"] = "2001:500:84::b"
+ rootservers_v6["c.root-servers.net"] = "2001:500:2::c"
+ rootservers_v6["d.root-servers.net"] = "2001:500:2d::d"
+ rootservers_v6["e.root-servers.net"] = "2001:500:a8::e"
rootservers_v6["f.root-servers.net"] = "2001:500:2f::f"
- rootservers_v6["h.root-servers.net"] = "2001:500:1::803f:235"
+ rootservers_v6["g.root-servers.net"] = "2001:500:12::d0d"
+ rootservers_v6["h.root-servers.net"] = "2001:500:1::53"
+ rootservers_v6["i.root-servers.net"] = "2001:7fe::53"
rootservers_v6["j.root-servers.net"] = "2001:503:c27::2:30"
rootservers_v6["k.root-servers.net"] = "2001:7fd::1"
+ rootservers_v6["l.root-servers.net"] = "2001:500:9f::42"
rootservers_v6["m.root-servers.net"] = "2001:dc3::35"
container_dn = "DC=RootDNSServers,CN=MicrosoftDNS,%s,%s" % (prefix, domaindn)
diff --git a/python/samba/tests/samba_tool/user_virtualCryptSHA.py b/python/samba/tests/samba_tool/user_virtualCryptSHA.py
index 31c681d..3ac4661 100644
--- a/python/samba/tests/samba_tool/user_virtualCryptSHA.py
+++ b/python/samba/tests/samba_tool/user_virtualCryptSHA.py
@@ -31,9 +31,15 @@ from samba import dsdb
import binascii
import md5
import re
-
-USER_NAME = "CyyptSHATestUser"
-USER_PASS = samba.generate_random_password(32,32)
+import random
+import string
+
+USER_NAME = "CryptSHATestUser"
+# Create a random 32 character password, containing only letters and
+# digits to avoid issues when used on the command line.
+USER_PASS = ''.join(random.choice(string.ascii_uppercase +
+ string.ascii_lowercase +
+ string.digits) for _ in range(32))
HASH_OPTION = "password hash userPassword schemes"
# Get the value of an attribute from the output string
diff --git a/python/samba/tests/samba_tool/user_wdigest.py b/python/samba/tests/samba_tool/user_wdigest.py
index ff08420..b531ad0 100644
--- a/python/samba/tests/samba_tool/user_wdigest.py
+++ b/python/samba/tests/samba_tool/user_wdigest.py
@@ -33,9 +33,15 @@ from samba.dcerpc import drsblobs
import binascii
import md5
import re
+import random
+import string
USER_NAME = "WdigestTestUser"
-USER_PASS = samba.generate_random_password(32, 32)
+# Create a random 32 character password, containing only letters and
+# digits to avoid issues when used on the command line.
+USER_PASS = ''.join(random.choice(string.ascii_uppercase +
+ string.ascii_lowercase +
+ string.digits) for _ in range(32))
# Calculate the MD5 password digest from the supplied user, realm and password
#
--
Samba Shared Repository
More information about the samba-cvs
mailing list