[SCM] Samba Shared Repository - branch master updated
Douglas Bagnall
dbagnall at samba.org
Sat May 5 05:26:02 UTC 2018
The branch, master has been updated
via 2073635 traffic: ensure we are using the same division in py 2 and 3
via cb40e2b autobuild: do not try to send email to no recipient
via 406284b samba_kcc: remove an unused variable
via 2c6cac9 sambatool tests: make assertMatch use assertIn
via ac053b1 .gitignore .agignore
via e6669d1 gitignore .gdb_history anywhere in the tree
via 6b7494f perftest: ad_dc_medley failing base search failed to catch exception
via 4eeb43d autobuild: add compiler version to results tarball
via f94c9a1 auth/ntlmssp_client: correct spelling of response
via a66f941 auth/pycredentials: correct spelling of reponse
from 54f2989 tests: libsmbclient: Add a readdirplus() test suite.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2073635d5818aa3fc844ee40dde0c8ae42ac5abd
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu Apr 19 14:13:47 2018 +1200
traffic: ensure we are using the same division in py 2 and 3
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
Autobuild-User(master): Douglas Bagnall <dbagnall at samba.org>
Autobuild-Date(master): Sat May 5 07:25:13 CEST 2018 on sn-devel-144
commit cb40e2bbc8a34a1ec3584ab585c5bf44c037ef0e
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Fri Mar 23 11:24:16 2018 +1300
autobuild: do not try to send email to no recipient
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 406284be95d38d9fbdfb970fbe6cb17f25c63bf6
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu Mar 15 11:55:40 2018 +1300
samba_kcc: remove an unused variable
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 2c6cac990e64983c7fdb5beb3316ef956fa0b0bc
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Fri Mar 9 15:20:53 2018 +1300
sambatool tests: make assertMatch use assertIn
With a note to tidy this up at some point
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit ac053b1493157c752d7c7c802e95b5222d61b71c
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu Aug 10 12:00:45 2017 +1200
.gitignore .agignore
.agingore is used by "the silver searcher", ag, which is a form of
grep with more useful defaults and prettier colours for searching
source trees.
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit e6669d126472091fb0b012fe2371557aa5bc4c6c
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu Aug 10 11:59:44 2017 +1200
gitignore .gdb_history anywhere in the tree
For when you run gdb in places like lib/ldb/ and it decides to leave
behind a history file.
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 6b7494f5e7f72a29350d5fbbf2dbae866ded9b63
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu Aug 24 15:02:43 2017 +1200
perftest: ad_dc_medley failing base search failed to catch exception
This meant it only happened once.
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit 4eeb43d06c7bfe1e3661c954586eed0b88315ee8
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Fri May 4 15:26:47 2018 +1200
autobuild: add compiler version to results tarball
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit f94c9a135785414d6fed8785369c0c16e1fcb9b9
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu Apr 19 16:21:06 2018 +1200
auth/ntlmssp_client: correct spelling of response
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
commit a66f941619ecf4f2cae8680143e990307f42e264
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date: Thu Apr 19 16:20:25 2018 +1200
auth/pycredentials: correct spelling of reponse
Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 4 ++--
auth/credentials/pycredentials.c | 2 +-
auth/ntlmssp/ntlmssp_client.c | 6 +++++-
python/samba/emulate/traffic.py | 2 +-
python/samba/kcc/__init__.py | 2 --
python/samba/tests/samba_tool/base.py | 3 ++-
script/autobuild.py | 7 ++++++-
source4/dsdb/tests/python/ad_dc_medley_performance.py | 13 +++++++++----
8 files changed, 26 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index 1f06493..ac05c21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,8 +64,8 @@ semantic.cache
/bin/.confcache/*/*
/bin/.conf_check_*/*
/.emacs.desktop*
-/.gdb_history
+.gdb_history
.clang-format
-
+.agignore
# generated by configure
python/samba/provision/kerberos_implementation.py
diff --git a/auth/credentials/pycredentials.c b/auth/credentials/pycredentials.c
index 638ae8d..68bb306 100644
--- a/auth/credentials/pycredentials.c
+++ b/auth/credentials/pycredentials.c
@@ -130,7 +130,7 @@ static PyObject *py_creds_get_ntlm_response(PyObject *self, PyObject *args, PyOb
ret = Py_BuildValue("{sis" PYARG_BYTES_LEN "s" PYARG_BYTES_LEN
"s" PYARG_BYTES_LEN "s" PYARG_BYTES_LEN "}",
"flags", flags,
- "lm_reponse",
+ "lm_response",
(const char *)lm_response.data, lm_response.length,
"nt_response",
(const char *)nt_response.data, nt_response.length,
diff --git a/auth/ntlmssp/ntlmssp_client.c b/auth/ntlmssp/ntlmssp_client.c
index db2003f..7dcf235 100644
--- a/auth/ntlmssp/ntlmssp_client.c
+++ b/auth/ntlmssp/ntlmssp_client.c
@@ -777,7 +777,11 @@ NTSTATUS gensec_ntlmssp_client_start(struct gensec_security *gensec_security)
ntlmssp_state->unicode = gensec_setting_bool(gensec_security->settings, "ntlmssp_client", "unicode", true);
- ntlmssp_state->use_nt_response = gensec_setting_bool(gensec_security->settings, "ntlmssp_client", "send_nt_reponse", true);
+ ntlmssp_state->use_nt_response = \
+ gensec_setting_bool(gensec_security->settings,
+ "ntlmssp_client",
+ "send_nt_response",
+ true);
ntlmssp_state->allow_lm_response = lpcfg_client_lanman_auth(gensec_security->settings->lp_ctx);
diff --git a/python/samba/emulate/traffic.py b/python/samba/emulate/traffic.py
index 9d95e3a..afb57da 100644
--- a/python/samba/emulate/traffic.py
+++ b/python/samba/emulate/traffic.py
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-from __future__ import print_function
+from __future__ import print_function, division
import time
import os
diff --git a/python/samba/kcc/__init__.py b/python/samba/kcc/__init__.py
index be1c4d8..fae9dbd 100644
--- a/python/samba/kcc/__init__.py
+++ b/python/samba/kcc/__init__.py
@@ -858,8 +858,6 @@ class KCC(object):
:param current_dsa: optional DSA on whose behalf we are acting.
:return: None
"""
- count = 0
-
ro = False
if current_dsa is None:
current_dsa = self.my_dsa
diff --git a/python/samba/tests/samba_tool/base.py b/python/samba/tests/samba_tool/base.py
index de257e3..89a0922 100644
--- a/python/samba/tests/samba_tool/base.py
+++ b/python/samba/tests/samba_tool/base.py
@@ -96,10 +96,11 @@ class SambaToolCmdTest(samba.tests.BlackboxTestCase):
self.assertIsNotNone(val, msg)
def assertMatch(self, base, string, msg=None):
+ # Note: we should stop doing this and just use self.assertIn()
if msg is None:
msg = "%r is not in %r" % (truncate_string(string),
truncate_string(base))
- self.assertTrue(string in base, msg)
+ self.assertIn(string, base, msg)
def randomName(self, count=8):
"""Create a random name, cap letters and numbers, and always starting with a letter"""
diff --git a/script/autobuild.py b/script/autobuild.py
index 0ac65f1..65b89d1 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)
@@ -692,6 +692,11 @@ parser.add_option("", "--restrict-tests", help="run as make test with this TESTS
default='')
def send_email(subject, text, log_tar):
+ if options.email is None:
+ do_print("not sending email because the recipient is not set")
+ do_print("the text content would have been:\n\nSubject: %s\n\nTs" %
+ (subject, text))
+ return
outer = MIMEMultipart()
outer['Subject'] = subject
outer['To'] = options.email
diff --git a/source4/dsdb/tests/python/ad_dc_medley_performance.py b/source4/dsdb/tests/python/ad_dc_medley_performance.py
index f49563c..05be482 100644
--- a/source4/dsdb/tests/python/ad_dc_medley_performance.py
+++ b/source4/dsdb/tests/python/ad_dc_medley_performance.py
@@ -38,6 +38,7 @@ from samba.auth import system_session
from ldb import Message, MessageElement, Dn, LdbError
from ldb import FLAG_MOD_ADD, FLAG_MOD_REPLACE, FLAG_MOD_DELETE
from ldb import SCOPE_BASE, SCOPE_SUBTREE, SCOPE_ONELEVEL
+from ldb import ERR_NO_SUCH_OBJECT
parser = optparse.OptionParser("ad_dc_performance.py [options] <host>")
sambaopts = options.SambaOptions(parser)
@@ -222,15 +223,19 @@ class UserTests(samba.tests.TestCase):
attrs=['cn'])
except LdbError as e:
(num, msg) = e.args
- if num != 32:
+ if num != ERR_NO_SUCH_OBJECT:
raise
def _test_base_search_failing(self):
pattern = 'missing%d' + self.ou
for i in range(4000):
- self.ldb.search(pattern % i,
- scope=SCOPE_BASE,
- attrs=['cn'])
+ try:
+ self.ldb.search(pattern % i,
+ scope=SCOPE_BASE,
+ attrs=['cn'])
+ except LdbError as (num, msg):
+ if num != ERR_NO_SUCH_OBJECT:
+ raise
def search_expression_list(self, expressions, rounds,
attrs=['cn'],
--
Samba Shared Repository
More information about the samba-cvs
mailing list