[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via bc1583d3689 selftest: correcting empty attribute usage in requests via 64bccb9bca7 ldap: test for empty attributes list from ad3af7cdffb lib util debug: Increase format buffer to 4KiB https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit bc1583d368902c2e384ed0080c8de003b982a6f7 Author: Aaron Haslett Date: Thu Mar 28 15:54:06 2019 +1300 selftest: correcting empty attribute usage in requests Many parts of Samba use an empty attribute list in requests expecting all attributes to be returned in the response, which is incorrect. This patch corrects the instances found by current CI tests. Static analysis and debugging will need to be done before changing ildap to the correct semantics. Signed-off-by: Aaron Haslett Reviewed-by: Garming Sam Reviewed-by: Andrew Bartlett Autobuild-User(master): Garming Sam Autobuild-Date(master): Mon May 6 05:45:55 UTC 2019 on sn-devel-184 commit 64bccb9bca77b0b7b46f645267f81f879f31e3d1 Author: Aaron Haslett Date: Wed Mar 20 19:17:07 2019 +1300 ldap: test for empty attributes list Test for LDAP request with an empty attribute list. LDB responds with no attributes, but LDAP responds with all attributes. Fix is attached to the bug below but we can't push it upstream until we've found all instances of incorrect empty attribute list usage in Samba. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13852 Signed-off-by: Aaron Haslett Reviewed-by: Garming Sam Reviewed-by: Andrew Bartlett --- Summary of changes: python/samba/tests/samba_tool/computer.py | 2 +- python/samba/tests/samba_tool/group.py | 3 +-- python/samba/tests/samba_tool/ou.py | 3 +-- python/samba/tests/samba_tool/user.py | 2 +- selftest/knownfail.d/ldap | 3 ++- source4/dsdb/tests/python/ldap.py | 17 + source4/dsdb/tests/python/sec_descriptor.py | 2 +- 7 files changed, 24 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/python/samba/tests/samba_tool/computer.py b/python/samba/tests/samba_tool/computer.py index 38ea5f774c4..6b06d4f32f6 100644 --- a/python/samba/tests/samba_tool/computer.py +++ b/python/samba/tests/samba_tool/computer.py @@ -282,7 +282,7 @@ class ComputerCmdTestCase(SambaToolCmdTest): self.samdb.domain_dn())) computerlist = self.samdb.search(base=self.samdb.domain_dn(), scope=ldb.SCOPE_SUBTREE, - expression=search_filter, attrs=[]) + expression=search_filter) if computerlist: return computerlist[0] else: diff --git a/python/samba/tests/samba_tool/group.py b/python/samba/tests/samba_tool/group.py index 9862251ff01..e521c720b77 100644 --- a/python/samba/tests/samba_tool/group.py +++ b/python/samba/tests/samba_tool/group.py @@ -243,8 +243,7 @@ class GroupCmdTestCase(SambaToolCmdTest): self.samdb.domain_dn())) grouplist = self.samdb.search(base=self.samdb.domain_dn(), scope=ldb.SCOPE_SUBTREE, - expression=search_filter, - attrs=[]) + expression=search_filter) if grouplist: return grouplist[0] else: diff --git a/python/samba/tests/samba_tool/ou.py b/python/samba/tests/samba_tool/ou.py index d318fd3ff85..39b0cad4250 100644 --- a/python/samba/tests/samba_tool/ou.py +++ b/python/samba/tests/samba_tool/ou.py @@ -264,8 +264,7 @@ class OUCmdTestCase(SambaToolCmdTest): self.samdb.domain_dn())) oulist = self.samdb.search(base=self.samdb.domain_dn(), scope=ldb.SCOPE_SUBTREE, - expression=search_filter, - attrs=[]) + expression=search_filter) if oulist: return oulist[0] else: diff --git a/python/samba/tests/samba_tool/user.py b/python/samba/tests/samba_tool/user.py index 1816b895de4..7ae80876b2a 100644 --- a/python/samba/tests/samba_tool/user.py +++ b/python/samba/tests/samba_tool/user.py @@ -592,7 +592,7 @@ sAMAccountName: %s search_filter = "(&(sAMAccountName=%s)(objectCategory=%s,%s))" % (ldb.binary_encode(name), "CN=Person,CN=Schema,CN=Configuration", self.samdb.domain_dn()) userlist = self.samdb.search(base=self.samdb.domain_dn(), scope=ldb.SCOPE_SUBTREE, -
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via ad3af7cdffb lib util debug: Increase format buffer to 4KiB from f9800450c36 .gitlab-ci.yml: add docker tag back for private jobs https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit ad3af7cdffb98b7998857db609548fc96f60c669 Author: Gary Lockyer Date: Thu Apr 18 10:23:22 2019 +1200 lib util debug: Increase format buffer to 4KiB Increase the debug line buffer to 4KiB, the existing size of 1KiB is too small for dsdbChange JSON audit messages. These messages were then split across multipe lines causing issues in log ingestion tools expecting single line messages. Bug: https://bugzilla.samba.org/show_bug.cgi?id=13902 Signed-off-by: Gary Lockyer Reviewed-by: Douglas Bagnall Autobuild-User(master): Gary Lockyer Autobuild-Date(master): Mon May 6 01:18:22 UTC 2019 on sn-devel-184 --- Summary of changes: lib/util/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/lib/util/debug.c b/lib/util/debug.c index e6a1ba4f96f..23c78ae19c9 100644 --- a/lib/util/debug.c +++ b/lib/util/debug.c @@ -44,7 +44,7 @@ * format_bufr[FORMAT_BUFR_SIZE - 1] should always be reserved * for a terminating null byte. */ -#define FORMAT_BUFR_SIZE 1024 +#define FORMAT_BUFR_SIZE 4096 /* -- ** * This module implements Samba's debugging utility. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f9800450c36 .gitlab-ci.yml: add docker tag back for private jobs via ee54661df90 .gitlab-ci.yml: rm abs path in artifacts via 051af0025cc bootstrap: add lcov to generate code coverage report from abf5d7d7e15 smbd: Use "ISDOT" in reply_setatr https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f9800450c36161f5fbe5d75ee4e85c56c4101be9 Author: Joe Guo Date: Thu May 2 11:04:05 2019 +1200 .gitlab-ci.yml: add docker tag back for private jobs Signed-off-by: Joe Guo Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Sun May 5 23:22:54 UTC 2019 on sn-devel-184 commit ee54661df9054295b0f3aa8e49898ead37a2aac4 Author: Joe Guo Date: Thu May 2 11:05:23 2019 +1200 .gitlab-ci.yml: rm abs path in artifacts According to doc: https://docs.gitlab.com/ee/user/project/pipelines/job_artifacts.html#defining-artifacts-in-gitlab-ciyml all paths in artifacts must be relative to the cloned repo, so this line actually never worked. Signed-off-by: Joe Guo Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett commit 051af0025cc30e56760e6a1cd2a747c01c7131a2 Author: Joe Guo Date: Fri May 3 14:21:24 2019 +1200 bootstrap: add lcov to generate code coverage report Signed-off-by: Joe Guo Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- Summary of changes: .gitlab-ci.yml | 4 ++-- bootstrap/config.py| 1 + bootstrap/generated-dists/centos6/bootstrap.sh | 1 + bootstrap/generated-dists/centos6/packages.yml | 1 + bootstrap/generated-dists/centos7/bootstrap.sh | 1 + bootstrap/generated-dists/centos7/packages.yml | 1 + bootstrap/generated-dists/debian7/bootstrap.sh | 1 + bootstrap/generated-dists/debian7/packages.yml | 1 + bootstrap/generated-dists/debian8/bootstrap.sh | 1 + bootstrap/generated-dists/debian8/packages.yml | 1 + bootstrap/generated-dists/debian9/bootstrap.sh | 1 + bootstrap/generated-dists/debian9/packages.yml | 1 + bootstrap/generated-dists/fedora28/bootstrap.sh| 1 + bootstrap/generated-dists/fedora28/packages.yml| 1 + bootstrap/generated-dists/fedora29/bootstrap.sh| 1 + bootstrap/generated-dists/fedora29/packages.yml| 1 + bootstrap/generated-dists/opensuse150/bootstrap.sh | 1 + bootstrap/generated-dists/opensuse150/packages.yml | 1 + bootstrap/generated-dists/ubuntu1404/bootstrap.sh | 1 + bootstrap/generated-dists/ubuntu1404/packages.yml | 1 + bootstrap/generated-dists/ubuntu1604/bootstrap.sh | 1 + bootstrap/generated-dists/ubuntu1604/packages.yml | 1 + bootstrap/generated-dists/ubuntu1804/bootstrap.sh | 1 + bootstrap/generated-dists/ubuntu1804/packages.yml | 1 + bootstrap/sha1sum.txt | 2 +- 25 files changed, 26 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bff0e089058..8b9d0cb69be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ variables: # Set this to the contents of bootstrap/sha1sum.txt # which is generated by bootstrap/template.py --render # - SAMBA_CI_CONTAINER_TAG: 4cc4709edd40e4e7c64f9eb255f953eed7924b1f + SAMBA_CI_CONTAINER_TAG: 2be76362af215af6842e884abd5246dd9b50c283 # We use the ubuntu1804 image as default as # it matches what we have on sn-devel-184. SAMBA_CI_CONTAINER_IMAGE: ubuntu1804 @@ -75,7 +75,6 @@ include: - "*.stdout" - "*.stderr" - system-info.txt - - /tmp/samba-testbase/*/*/bin/config.log retry: max: 2 when: @@ -154,6 +153,7 @@ samba-ad-dc-ntvfs: .private_template: extends: .shared_template tags: +- docker - samba-ci-private only: variables: diff --git a/bootstrap/config.py b/bootstrap/config.py index ac2628530f1..627b7e11397 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -44,6 +44,7 @@ COMMON = [ 'gzip', 'hostname', 'htop', +'lcov', 'make', 'patch', 'perl', diff --git a/bootstrap/generated-dists/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh index fdd04385a02..521d571d1f6 100755 --- a/bootstrap/generated-dists/centos6/bootstrap.sh +++ b/bootstrap/generated-dists/centos6/bootstrap.sh @@ -41,6 +41,7 @@ yum -y -q --verbose install \ keyutils-libs-devel \ krb5-devel \ krb5-server \ +lcov \ libacl-devel \ libaio-devel \ libarchive-devel \ diff --git a/bootstrap/generated-dists/centos6/packages.yml b/bootstrap/generated-dists/centos6/packages.yml index 307d31826e6..c9aef4d64ee 100644 ---
