diff --git a/1528.patch b/1528.patch deleted file mode 100644 index 52ecfab..0000000 --- a/1528.patch +++ /dev/null @@ -1,66 +0,0 @@ -From e3629a3924107507be9ddb2c001f9843854ddf3b Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Tue, 25 Aug 2020 17:39:18 +0200 -Subject: [PATCH] third_party: Update resolv_wrapper to version 1.1.7 - -This fixes some Samba tests which redirect stderr to stdout and then get -more messages than expected. - -Signed-off-by: Andreas Schneider ---- - buildtools/wafsamba/samba_third_party.py | 2 +- - third_party/resolv_wrapper/resolv_wrapper.c | 4 ++-- - third_party/resolv_wrapper/wscript | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/buildtools/wafsamba/samba_third_party.py b/buildtools/wafsamba/samba_third_party.py -index 318da4f4eff..bc2b21f2a55 100644 ---- a/buildtools/wafsamba/samba_third_party.py -+++ b/buildtools/wafsamba/samba_third_party.py -@@ -34,7 +34,7 @@ Build.BuildContext.CHECK_NSS_WRAPPER = CHECK_NSS_WRAPPER - - @conf - def CHECK_RESOLV_WRAPPER(conf): -- return conf.CHECK_BUNDLED_SYSTEM_PKG('resolv_wrapper', minversion='1.1.6') -+ return conf.CHECK_BUNDLED_SYSTEM_PKG('resolv_wrapper', minversion='1.1.7') - Build.BuildContext.CHECK_RESOLV_WRAPPER = CHECK_RESOLV_WRAPPER - - @conf -diff --git a/third_party/resolv_wrapper/resolv_wrapper.c b/third_party/resolv_wrapper/resolv_wrapper.c -index 0d3f34ce591..b69a55a80e0 100644 ---- a/third_party/resolv_wrapper/resolv_wrapper.c -+++ b/third_party/resolv_wrapper/resolv_wrapper.c -@@ -1844,7 +1844,7 @@ static int rwrap_parse_resolv_conf(struct __res_state *state, - - fp = fopen(resolv_conf, "r"); - if (fp == NULL) { -- RWRAP_LOG(RWRAP_LOG_ERROR, -+ RWRAP_LOG(RWRAP_LOG_WARN, - "Opening %s failed: %s", - resolv_conf, strerror(errno)); - return -1; -@@ -1930,7 +1930,7 @@ static int rwrap_parse_resolv_conf(struct __res_state *state, - fclose(fp); - - if (nserv == 0) { -- RWRAP_LOG(RWRAP_LOG_ERROR, -+ RWRAP_LOG(RWRAP_LOG_WARN, - "No usable nameservers found in %s", - resolv_conf); - errno = ESRCH; -diff --git a/third_party/resolv_wrapper/wscript b/third_party/resolv_wrapper/wscript -index ea3df498a6e..a7f18389b0f 100644 ---- a/third_party/resolv_wrapper/wscript -+++ b/third_party/resolv_wrapper/wscript -@@ -2,7 +2,7 @@ - - import os - --VERSION="1.1.6" -+VERSION="1.1.7" - - def configure(conf): - if conf.CHECK_RESOLV_WRAPPER(): --- -GitLab - diff --git a/1624.patch b/1624.patch deleted file mode 100644 index 124c239..0000000 --- a/1624.patch +++ /dev/null @@ -1,1389 +0,0 @@ -From 9cf2118afce0b1534c0daea4ab97f29225f7fcb1 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Wed, 21 Oct 2020 07:43:08 +0200 -Subject: [PATCH 1/9] python: Create targetdir recursively - -This fixes `make test` in a release tarball. - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14542 - -Signed-off-by: Andreas Schneider ---- - python/samba/netcmd/domain.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py -index 000688f4e7a..5f08ddf6007 100644 ---- a/python/samba/netcmd/domain.py -+++ b/python/samba/netcmd/domain.py -@@ -445,7 +445,7 @@ class cmd_domain_provision(Command): - - if targetdir is not None: - if not os.path.isdir(targetdir): -- os.mkdir(targetdir) -+ os.makedirs(targetdir) - - eadb = True - --- -GitLab - - -From f69a5a15550a2330710ba09e06daf826deedeb34 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Thu, 22 Oct 2020 11:39:04 +0200 -Subject: [PATCH 2/9] testprogs: Add remove_directory to common test functions - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14542 - -Signed-off-by: Andreas Schneider ---- - testprogs/blackbox/common_test_fns.inc | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/testprogs/blackbox/common_test_fns.inc b/testprogs/blackbox/common_test_fns.inc -index a5611c63fa0..7b421e9eb08 100755 ---- a/testprogs/blackbox/common_test_fns.inc -+++ b/testprogs/blackbox/common_test_fns.inc -@@ -107,3 +107,14 @@ kerberos_kinit() { - fi - return $status - } -+ -+remove_directory() { -+ local xdir=${1} -+ shift -+ -+ if [ "$xdir" == "/" ] || [ ! -d "$xdir" ] || [ ! $(ls -A "$xdir") ]; then -+ return -+ fi -+ -+ rm -rf "$xdir" -+} --- -GitLab - - -From 5c65e1a9e99d9dcfadb90433b2465db277814666 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Tue, 20 Oct 2020 20:47:43 +0200 -Subject: [PATCH 3/9] testprogs: Fix and improve demote-saveddb test - -This fixes running `make test` in a release tarball! - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14542 - -Signed-off-by: Andreas Schneider ---- - testprogs/blackbox/demote-saveddb.sh | 75 ++++++++++++++++------------ - 1 file changed, 43 insertions(+), 32 deletions(-) - -diff --git a/testprogs/blackbox/demote-saveddb.sh b/testprogs/blackbox/demote-saveddb.sh -index 3d5fabd72e3..d8fccf32011 100755 ---- a/testprogs/blackbox/demote-saveddb.sh -+++ b/testprogs/blackbox/demote-saveddb.sh -@@ -10,58 +10,69 @@ fi - PREFIX_ABS="$1" - shift 1 - --. `dirname $0`/subunit.sh -+failed=0 - --tree_dir=`dirname $0`/../../source4/selftest/provisions/multi-dc-samba-master-c596ac6 -+. `dirname $0`/subunit.sh -+. `dirname $0`/common_test_fns.inc - --undump() { -- if test -x $BINDIR/tdbrestore; -- then -- `dirname $0`/../../source4/selftest/provisions/undump.sh $tree_dir $PREFIX_ABS $BINDIR/tdbrestore -- else -- `dirname $0`/../../source4/selftest/provisions/undump.sh $tree_dir $PREFIX_ABS -- fi --} -+samba_tree_dir="$SRCDIR_ABS/source4/selftest/provisions/multi-dc-samba-master-c596ac6" - --demote() { -- $PYTHON $BINDIR/samba-tool domain demote -H tdb://$PREFIX_ABS/private/sam.ldb --remove-other-dead-server=$1 --} -+samba_tdbrestore="tdbrestore" -+if [ -x $BINDIR/tdbrestore ]; then -+ samba_tdbrestore="$BINDIR/tdbrestore" -+fi - -+# The undump script and the provision data is not part of release tarballs, -+# skip the tests in this case! -+samba_undump="$SRCDIR_ABS/source4/selftest/provisions/undump.sh" -+if [ ! -x $samba_undump ] || [ ! -d $samba_tree_dir ]; then -+ subunit_start_test "undump" -+ subunit_skip_test "undump" < -Date: Wed, 21 Oct 2020 17:04:12 +0200 -Subject: [PATCH 4/9] testprogs: Fix and improve tombstones-expunge test - -This fixes running `make test` in a release tarball! - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14542 - -Signed-off-by: Andreas Schneider ---- - testprogs/blackbox/tombstones-expunge.sh | 94 +++++++++++++----------- - 1 file changed, 50 insertions(+), 44 deletions(-) - -diff --git a/testprogs/blackbox/tombstones-expunge.sh b/testprogs/blackbox/tombstones-expunge.sh -index aa37cfe278f..9e0588377d7 100755 ---- a/testprogs/blackbox/tombstones-expunge.sh -+++ b/testprogs/blackbox/tombstones-expunge.sh -@@ -11,9 +11,12 @@ PREFIX_ABS="$1" - RELEASE="$2" - shift 2 - -+failed=0 -+ - . `dirname $0`/subunit.sh -+. `dirname $0`/common_test_fns.inc - --release_dir=`dirname $0`/../../source4/selftest/provisions/$RELEASE -+release_dir="$SRCDIR_ABS/source4/selftest/provisions/$RELEASE" - - ldbadd="ldbadd" - if [ -x "$BINDIR/ldbadd" ]; then -@@ -35,13 +38,28 @@ if [ -x "$BINDIR/ldbsearch" ]; then - ldbsearch="$BINDIR/ldbsearch" - fi - -+samba_tdbrestore="tdbrestore" -+if [ -x "$BINDIR/tdbrestore" ]; then -+ samba_tdbrestore="$BINDIR/tdbrestore" -+fi -+ -+samba_undump="$SRCDIR_ABS/source4/selftest/provisions/undump.sh" -+if [ ! -x $samba_undump ] || [ ! -d $release_dir ]; then -+ subunit_start_test $RELEASE -+ subunit_skip_test $RELEASE < -Date: Wed, 21 Oct 2020 17:35:34 +0200 -Subject: [PATCH 5/9] testprogs: Fix and improve runtime-links test - -This fixes running `make test` in a release tarball! - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14542 - -Signed-off-by: Andreas Schneider ---- - testprogs/blackbox/common-links.sh | 16 +++---- - testprogs/blackbox/runtime-links.sh | 65 ++++++++++++++++------------- - 2 files changed, 44 insertions(+), 37 deletions(-) - -diff --git a/testprogs/blackbox/common-links.sh b/testprogs/blackbox/common-links.sh -index ee7310b5108..363234ae11c 100644 ---- a/testprogs/blackbox/common-links.sh -+++ b/testprogs/blackbox/common-links.sh -@@ -1,4 +1,4 @@ --release_dir=`dirname $0`/../../source4/selftest/provisions/$RELEASE -+release_dir=$SRCDIR_ABS/source4/selftest/provisions/$RELEASE - - ldbadd="ldbadd" - if [ -x "$BINDIR/ldbadd" ]; then -@@ -25,13 +25,15 @@ if [ -x "$BINDIR/ldbrename" ]; then - ldbrename="$BINDIR/ldbrename" - fi - -+samba_tdbrestore="tdbrestore" -+if [ -x "$BINDIR/tdbrestore" ]; then -+ samba_tdbrestore="$BINDIR/tdbrestore" -+fi -+ -+samba_undump="$SRCDIR_ABS/source4/selftest/provisions/undump.sh" -+ - undump() { -- if test -x $BINDIR/tdbrestore; -- then -- `dirname $0`/../../source4/selftest/provisions/undump.sh $release_dir $PREFIX_ABS/$RELEASE $BINDIR/tdbrestore -- else -- `dirname $0`/../../source4/selftest/provisions/undump.sh $release_dir $PREFIX_ABS/$RELEASE -- fi -+ $samba_undump $release_dir $PREFIX_ABS/$RELEASE $samba_tdbrestore - } - - add_dangling_link() { -diff --git a/testprogs/blackbox/runtime-links.sh b/testprogs/blackbox/runtime-links.sh -index 344b822f07e..f8de66c60e7 100755 ---- a/testprogs/blackbox/runtime-links.sh -+++ b/testprogs/blackbox/runtime-links.sh -@@ -11,10 +11,28 @@ PREFIX_ABS="$1" - RELEASE="$2" - shift 2 - -+failed=0 -+ - . `dirname $0`/subunit.sh - - . `dirname $0`/common-links.sh - -+. `dirname $0`/common_test_fns.inc -+ -+if [ ! -x $samba_undump ] || [ ! -d $release_dir ]; then -+ subunit_start_test $RELEASE -+ subunit_skip_test $RELEASE < -Date: Wed, 21 Oct 2020 17:41:27 +0200 -Subject: [PATCH 6/9] testprogs: Fix and improve dbcheck-links test - -This fixes running `make test` in a release tarball! - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14542 - -Signed-off-by: Andreas Schneider ---- - testprogs/blackbox/dbcheck-links.sh | 160 ++++++++++++++-------------- - 1 file changed, 82 insertions(+), 78 deletions(-) - -diff --git a/testprogs/blackbox/dbcheck-links.sh b/testprogs/blackbox/dbcheck-links.sh -index eb0e0b3163f..ead59d691e0 100755 ---- a/testprogs/blackbox/dbcheck-links.sh -+++ b/testprogs/blackbox/dbcheck-links.sh -@@ -14,6 +14,23 @@ shift 2 - . `dirname $0`/subunit.sh - - . `dirname $0`/common-links.sh -+. `dirname $0`/common_test_fns.inc -+ -+failed=0 -+ -+if [ ! -x $samba_undump ] || [ ! -d $release_dir ]; then -+ subunit_start_test $RELEASE -+ subunit_skip_test $RELEASE < -Date: Wed, 21 Oct 2020 17:54:54 +0200 -Subject: [PATCH 7/9] testprogs: Fix and improve functionalprep test - -This fixes running `make test` in a release tarball! - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14542 - -Signed-off-by: Andreas Schneider ---- - testprogs/blackbox/functionalprep.sh | 77 ++++++++++++++++------------ - 1 file changed, 44 insertions(+), 33 deletions(-) - -diff --git a/testprogs/blackbox/functionalprep.sh b/testprogs/blackbox/functionalprep.sh -index 1d37611ef7a..a5ac4b8bc7f 100755 ---- a/testprogs/blackbox/functionalprep.sh -+++ b/testprogs/blackbox/functionalprep.sh -@@ -10,45 +10,56 @@ fi - PREFIX_ABS="$1" - shift 1 - -+failed=0 -+ - . `dirname $0`/subunit.sh -+. `dirname $0`/common_test_fns.inc - - RELEASE="release-4-8-0-pre1" --release_dir=`dirname $0`/../../source4/selftest/provisions/$RELEASE -+release_dir="$SRCDIR_ABS/source4/selftest/provisions/$RELEASE" - - OLD_RELEASE="release-4-1-0rc3" --old_release_dir=`dirname $0`/../../source4/selftest/provisions/$OLD_RELEASE -+old_release_dir="$SRCDIR_ABS/source4/selftest/provisions/$OLD_RELEASE" - --cleanup_output_directories() --{ -- if [ -d $PREFIX_ABS/2012R2_schema ]; then -- rm -fr $PREFIX_ABS/2012R2_schema -- fi -+samba_tdbrestore="tdbrestore" -+if [ -x "$BINDIR/tdbrestore" ]; then -+ samba_tdbrestore="$BINDIR/tdbrestore" -+fi -+ -+samba_undump="$SRCDIR_ABS/source4/selftest/provisions/undump.sh" -+ -+if [ ! -x $samba_undump ] || [ ! -d $release_dir ] || [ ! -d $old_release_dir ]; then -+ subunit_start_test $RELEASE -+ subunit_skip_test $RELEASE < -Date: Wed, 21 Oct 2020 18:03:25 +0200 -Subject: [PATCH 8/9] testprogs: Fix and improve dbcheck-oldrelease test - -This fixes running `make test` in a release tarball! - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14542 - -Signed-off-by: Andreas Schneider ---- - testprogs/blackbox/dbcheck-oldrelease.sh | 240 ++++++++++++----------- - 1 file changed, 123 insertions(+), 117 deletions(-) - -diff --git a/testprogs/blackbox/dbcheck-oldrelease.sh b/testprogs/blackbox/dbcheck-oldrelease.sh -index 41c55178d4e..9e9924654be 100755 ---- a/testprogs/blackbox/dbcheck-oldrelease.sh -+++ b/testprogs/blackbox/dbcheck-oldrelease.sh -@@ -11,7 +11,10 @@ PREFIX_ABS="$1" - RELEASE="$2" - shift 2 - -+failed=0 -+ - . `dirname $0`/subunit.sh -+. `dirname $0`/common_test_fns.inc - - release_dir=`dirname $0`/../../source4/selftest/provisions/$RELEASE - -@@ -30,13 +33,94 @@ if [ -x "$BINDIR/ldbsearch" ]; then - ldbsearch="$BINDIR/ldbsearch" - fi - -+samba_tdbrestore="tdbrestore" -+if [ -x "$BINDIR/tdbrestore" ]; then -+ samba_tdbrestore="$BINDIR/tdbrestore" -+fi -+ -+samba_undump="$SRCDIR_ABS/source4/selftest/provisions/undump.sh" -+if [ ! -x $samba_undump ] || [ ! -d $release_dir ]; then -+ subunit_start_test $RELEASE -+ subunit_skip_test $RELEASE < -Date: Wed, 21 Oct 2020 19:14:32 +0200 -Subject: [PATCH 9/9] testprogs: Fix and improve upgradeprovision-oldrelease - test - -This fixes running `make test` in a release tarball! - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14542 - -Signed-off-by: Andreas Schneider ---- - .../blackbox/upgradeprovision-oldrelease.sh | 254 +++++++++--------- - 1 file changed, 121 insertions(+), 133 deletions(-) - -diff --git a/testprogs/blackbox/upgradeprovision-oldrelease.sh b/testprogs/blackbox/upgradeprovision-oldrelease.sh -index 208baa54a02..5b095fca05e 100755 ---- a/testprogs/blackbox/upgradeprovision-oldrelease.sh -+++ b/testprogs/blackbox/upgradeprovision-oldrelease.sh -@@ -11,37 +11,113 @@ PREFIX_ABS="$1" - RELEASE="$2" - shift 2 - -+failed=0 -+ - . `dirname $0`/subunit.sh -+. `dirname $0`/common_test_fns.inc - --release_dir=`dirname $0`/../../source4/selftest/provisions/${RELEASE} -+release_dir="$SRCDIR_ABS/source4/selftest/provisions/${RELEASE}" - - LDBDEL_BIN=ldbdel - if [ -x "$BINDIR/ldbdel" ]; then - LDBDEL_BIN=$BINDIR/ldbdel - fi - -+samba_tdbrestore="tdbrestore" -+if [ -x "$BINDIR/tdbrestore" ]; then -+ samba_tdbrestore="$BINDIR/tdbrestore" -+fi -+ -+samba_undump="$SRCDIR_ABS/source4/selftest/provisions/undump.sh" -+if [ ! -x $samba_undump ] || [ ! -d $release_dir ]; then -+ subunit_start_test "${RELEASE}" -+ subunit_skip_test "${RELEASE}" < $PREFIX_ABS/${RELEASE}_upgrade/etc/smb.conf -- -- cp -a $release_dir/private/*.keytab $PREFIX_ABS/${RELEASE}_upgrade_full/private/ -- cp -a $release_dir/sysvol $PREFIX_ABS/${RELEASE}_upgrade_full/ -- mkdir $PREFIX_ABS/${RELEASE}_upgrade_full/etc/ -- cat $release_dir/etc/smb.conf.template | \ -- sed "s|@@PREFIX@@|$PREFIX_ABS/${RELEASE}_upgrade_full|g" \ -- > $PREFIX_ABS/${RELEASE}_upgrade_full/etc/smb.conf -+ $samba_undump $release_dir $PREFIX_ABS/${RELEASE}_upgrade $samba_tdbrestore -+ $samba_undump $release_dir $PREFIX_ABS/${RELEASE}_upgrade_full $samba_tdbrestore -+ -+ cp -a $release_dir/private/*.keytab $PREFIX_ABS/${RELEASE}_upgrade/private/ -+ cp -a $release_dir/sysvol $PREFIX_ABS/${RELEASE}_upgrade/ -+ mkdir $PREFIX_ABS/${RELEASE}_upgrade/etc/ -+ sed -e "s|@@PREFIX@@|$PREFIX_ABS/${RELEASE}_upgrade|g" $release_dir/etc/smb.conf.template \ -+ > $PREFIX_ABS/${RELEASE}_upgrade/etc/smb.conf -+ -+ cp -a $release_dir/private/*.keytab $PREFIX_ABS/${RELEASE}_upgrade_full/private/ -+ cp -a $release_dir/sysvol $PREFIX_ABS/${RELEASE}_upgrade_full/ -+ mkdir $PREFIX_ABS/${RELEASE}_upgrade_full/etc/ -+ sed -e "s|@@PREFIX@@|$PREFIX_ABS/${RELEASE}_upgrade_full|g" $release_dir/etc/smb.conf.template \ -+ > $PREFIX_ABS/${RELEASE}_upgrade_full/etc/smb.conf - } - - remove_dns_user() { -@@ -122,116 +198,28 @@ ldapcmp_full_sd() { - $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/${RELEASE}_upgrade_reference/private/sam.ldb tdb://$PREFIX_ABS/${RELEASE}_upgrade_full/private/sam.ldb --two --sd --skip-missing-dn - } - --if [ -d $PREFIX_ABS/${RELEASE}_upgrade ]; then -- rm -fr $PREFIX_ABS/${RELEASE}_upgrade --fi -- --if [ -d $PREFIX_ABS/${RELEASE}_upgrade_full ]; then -- rm -fr $PREFIX_ABS/${RELEASE}_upgrade_full --fi -- --if [ -d $PREFIX_ABS/${RELEASE}_upgrade_reference ]; then -- rm -fr $PREFIX_ABS/${RELEASE}_upgrade_reference --fi -- --if [ -d $release_dir ]; then -- testit $RELEASE undump -- testit "remove_dns_user" remove_dns_user -- testit "upgradeprovision" upgradeprovision -- testit "upgradeprovision_full" upgradeprovision_full -- testit "reindex" reindex -- testit_expect_failure "dbcheck" dbcheck -- testit_expect_failure "dbcheck_full" dbcheck_full -- testit "dbcheck_clean" dbcheck_clean -- testit "dbcheck_full_clean" dbcheck_full_clean -- testit "dbcheck_full_clean_well_known_acls" dbcheck_full_clean_well_known_acls -- testit "referenceprovision" referenceprovision -- testit "samba_upgradedns" samba_upgradedns -- testit "ldapcmp" ldapcmp -- testit "ldapcmp_sd" ldapcmp_sd -- testit "ldapcmp_full_sd" ldapcmp_full_sd --else -- subunit_start_test "${RELEASE}" -- subunit_skip_test "${RELEASE}" < -Date: Thu, 22 Oct 2020 11:08:19 +0200 -Subject: [PATCH 1/5] s3:script: Fix test_dfree_quota.sh - -source3/script/tests/test_dfree_quota.sh: line 200: [: missing `]' - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14550 - -Signed-off-by: Andreas Schneider ---- - source3/script/tests/test_dfree_quota.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source3/script/tests/test_dfree_quota.sh b/source3/script/tests/test_dfree_quota.sh -index e86d431180a..a1403a8c4ba 100755 ---- a/source3/script/tests/test_dfree_quota.sh -+++ b/source3/script/tests/test_dfree_quota.sh -@@ -197,7 +197,7 @@ test_smbcquotas() { - return $status - } - --if [ $protocol != "SMB3" -a $protocol != "NT1"]; then -+if [ $protocol != "SMB3" ] && [ $protocol != "NT1" ]; then - echo "unsupported protocol $protocol" | subunit_fail_test "Test dfree quota" - failed=`expr $failed + 1` - fi --- -GitLab - - -From 4867cafe766fa8aa69ce005dc5c4f05a4af676c8 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Thu, 22 Oct 2020 17:40:01 +0200 -Subject: [PATCH 2/5] buildtools: Do not install binaries which are for - selftest - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14550 - -Signed-off-by: Andreas Schneider ---- - buildtools/wafsamba/wafsamba.py | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py -index 9f6ee4f5c7f..9dd6d05b91b 100644 ---- a/buildtools/wafsamba/wafsamba.py -+++ b/buildtools/wafsamba/wafsamba.py -@@ -365,8 +365,10 @@ def SAMBA_BINARY(bld, binname, source, - for_selftest=False): - '''define a Samba binary''' - -- if for_selftest and not bld.CONFIG_GET('ENABLE_SELFTEST'): -- enabled=False -+ if for_selftest: -+ install=False -+ if not bld.CONFIG_GET('ENABLE_SELFTEST'): -+ enabled=False - - if not enabled: - SET_TARGET_TYPE(bld, binname, 'DISABLED') --- -GitLab - - -From a4d5a21880b1cc8adfcbebd6940d06e2fdab3f14 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Thu, 22 Oct 2020 17:41:01 +0200 -Subject: [PATCH 3/5] unittests: Mark test binaries for selftest - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14550 - -Signed-off-by: Andreas Schneider ---- - testsuite/unittests/wscript | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/testsuite/unittests/wscript b/testsuite/unittests/wscript -index 40fcb01ad57..2b4b37b92de 100644 ---- a/testsuite/unittests/wscript -+++ b/testsuite/unittests/wscript -@@ -9,7 +9,7 @@ def build(bld): - bld.SAMBA_BINARY('test_krb5samba', - source='test_krb5_samba.c', - deps='krb5samba cmocka', -- install=False) -+ for_selftest=True) - - bld.SAMBA_BINARY('test_sambafs_srv_pipe', - source='test_sambafs_srv_pipe.c', -@@ -18,7 +18,7 @@ def build(bld): - RPC_SAMR - cmocka - ''', -- install=False) -+ for_selftest=True) - - bld.SAMBA_BINARY('test_lib_util_modules', - source='test_lib_util_modules.c', -@@ -26,7 +26,7 @@ def build(bld): - samba-modules - cmocka - ''', -- install=False) -+ for_selftest=True) - - bld.SAMBA_MODULE('rpc_test_dummy_module', - source='rpc_test_dummy_module.c', --- -GitLab - - -From d399761e8261a4de5ce9449f97ade61388e8a1e2 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Fri, 23 Oct 2020 08:53:43 +0200 -Subject: [PATCH 4/5] s3:modules: Do not install vfs modules only used for - testing - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14550 - -Signed-off-by: Andreas Schneider ---- - source3/modules/wscript_build | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build -index c4f3db22296..36b047ef79b 100644 ---- a/source3/modules/wscript_build -+++ b/source3/modules/wscript_build -@@ -114,7 +114,8 @@ bld.SAMBA3_MODULE('vfs_fake_acls', - deps='samba-util', - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fake_acls'), -- enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fake_acls')) -+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fake_acls'), -+ install=False) - - bld.SAMBA3_MODULE('vfs_recycle', - subsystem='vfs', -@@ -622,21 +623,24 @@ bld.SAMBA3_MODULE('vfs_fake_dfq', - source='vfs_fake_dfq.c', - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fake_dfq'), -- enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fake_dfq')) -+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fake_dfq'), -+ install=False) - - bld.SAMBA3_MODULE('vfs_error_inject', - subsystem='vfs', - source='vfs_error_inject.c', - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_error_inject'), -- enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_error_inject')) -+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_error_inject'), -+ install=False) - - bld.SAMBA3_MODULE('vfs_delay_inject', - subsystem='vfs', - source='vfs_delay_inject.c', - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_delay_inject'), -- enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_delay_inject')) -+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_delay_inject'), -+ install=False) - - bld.SAMBA3_MODULE('vfs_widelinks', - subsystem='vfs', --- -GitLab - - -From 58e412ac6d9822aa65639d7c1171a2723ca3ee8a Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Fri, 23 Oct 2020 08:57:12 +0200 -Subject: [PATCH 5/5] examples:auth: Do not install example plugin - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14550 - -Signed-off-by: Andreas Schneider ---- - examples/auth/wscript_build | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/examples/auth/wscript_build b/examples/auth/wscript_build -index 91f5302918b..03221238e5f 100644 ---- a/examples/auth/wscript_build -+++ b/examples/auth/wscript_build -@@ -6,4 +6,5 @@ bld.SAMBA3_MODULE('auth_skel', - deps='samba-util', - init_function='', - internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_skel'), -- enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_skel')) -+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_skel'), -+ install=False) --- -GitLab - diff --git a/samba-dnspython-2.0.0-v4.13.patch b/samba-dnspython-2.0.0-v4.13.patch deleted file mode 100644 index 88aead2..0000000 --- a/samba-dnspython-2.0.0-v4.13.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 12b51be8633689763080f2eb1e0b13487e3e71e1 Mon Sep 17 00:00:00 2001 -From: Alexander Bokovoy -Date: Sat, 24 Oct 2020 12:17:44 +0300 -Subject: [PATCH] DNS Resolver: support both dnspython before and after 2.0.0 - -`dnspython` 2.0.0 has many changes and several deprecations like: - -``` -> dns.resolver.resolve() has been added, allowing control of whether -search lists are used. dns.resolver.query() is retained for backwards -compatibility, but deprecated. The default for search list behavior can -be set at in the resolver object with the use_search_by_default -parameter. The default is False. - -> dns.resolver.resolve_address() has been added, allowing easy -address-to-name lookups. -``` - -The new class `DNSResolver`: -- provides the compatibility layer -- defaults the previous behavior (the search list configured in the - system's resolver configuration is used for relative names) -- defaults lifetime to 15sec (determines the number of seconds - to spend trying to get an answer to the question) - -The compatibility shim was developed by Stanislav Levin for FreeIPA and -adopted for Samba by Alexander Bokovoy. - -Signed-off-by: Stanislav Levin -Signed-off-by: Alexander Bokovoy ---- - python/samba/dnsresolver.py | 68 +++++++++++++++++++++++++++ - source4/scripting/bin/samba_dnsupdate | 5 +- - 2 files changed, 71 insertions(+), 2 deletions(-) - create mode 100644 python/samba/dnsresolver.py - -diff --git a/python/samba/dnsresolver.py b/python/samba/dnsresolver.py -new file mode 100644 -index 00000000000..a627555a855 ---- /dev/null -+++ b/python/samba/dnsresolver.py -@@ -0,0 +1,68 @@ -+# Samba wrapper for DNS resolvers -+# -+# Copyright (C) Stanislav Levin -+# Copyright (C) Alexander Bokovoy -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 3 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see . -+# -+ -+import dns.resolver -+import dns.rdatatype -+import dns.reversename -+ -+class DNSResolver(dns.resolver.Resolver): -+ """DNS stub resolver compatible with both dnspython < 2.0.0 -+ and dnspython >= 2.0.0. -+ -+ Set `use_search_by_default` attribute to `True`, which -+ determines the default for whether the search list configured -+ in the system's resolver configuration is used for relative -+ names, and whether the resolver's domain may be added to relative -+ names. -+ -+ Increase the default lifetime which determines the number of seconds -+ to spend trying to get an answer to the question. dnspython 2.0.0 -+ changes this to 5sec, while the previous one was 30sec. -+ """ -+ def __init__(self, *args, **kwargs): -+ super().__init__(*args, **kwargs) -+ self.reset_defaults() -+ self.resolve = getattr(super(), "resolve", self.query) -+ self.resolve_address = getattr( -+ super(), -+ "resolve_address", -+ self._resolve_address -+ ) -+ -+ def reset_defaults(self): -+ self.use_search_by_default = True -+ # the default is 5sec -+ self.lifetime = 15 -+ -+ def reset(self): -+ super().reset() -+ self.reset_defaults() -+ -+ def _resolve_address(self, ip_address, *args, **kwargs): -+ """Query nameservers for PTR records. -+ -+ :param ip_address: IPv4 or IPv6 address -+ :type ip_address: str -+ """ -+ return self.resolve( -+ dns.reversename.from_address(ip_address), -+ rdtype=dns.rdatatype.PTR, -+ *args, -+ **kwargs, -+ ) -diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate -index 44eb1cadd27..fe04ce71338 100755 ---- a/source4/scripting/bin/samba_dnsupdate -+++ b/source4/scripting/bin/samba_dnsupdate -@@ -53,6 +53,7 @@ from samba.compat import get_string - from samba.compat import text_type - import ldb - -+from samba.dnsresolver import DNSResolver - import dns.resolver - import dns.exception - -@@ -259,7 +260,7 @@ def hostname_match(h1, h2): - - def get_resolver(d=None): - resolv_conf = os.getenv('RESOLV_CONF', default='/etc/resolv.conf') -- resolver = dns.resolver.Resolver(filename=resolv_conf, configure=True) -+ resolver = DNSResolver(filename=resolv_conf, configure=True) - - if d is not None and d.nameservers != []: - resolver.nameservers = d.nameservers -@@ -271,7 +272,7 @@ def check_one_dns_name(name, name_type, d=None): - if d and not d.nameservers: - d.nameservers = resolver.nameservers - # dns.resolver.Answer -- return resolver.query(name, name_type) -+ return resolver.resolve(name, name_type) - - def check_dns_name(d): - """check that a DNS entry exists.""" --- -2.28.0 - diff --git a/samba-systemd-notification.patch b/samba-systemd-notification.patch deleted file mode 100644 index 1011460..0000000 --- a/samba-systemd-notification.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 9dd1a4809b1b6d65bfb2258b443b0fe36e0a32f7 Mon Sep 17 00:00:00 2001 -From: Alexander Bokovoy -Date: Sat, 24 Oct 2020 16:52:43 +0300 -Subject: [PATCH] daemons: report status to systemd even when running in - foreground - -When systemd launches samba services, the configuration we have in -systemd service files expects that the main process (/usr/sbin/*) -would use sd_notify() to report back its status. However, we only use -sd_notify() when running become_daemon(). - -As a result, samba/smbd/winbindd/nmbd processes never report back its -status and the status updates from other childs (smbd, winbindd, etc) -are not accepted as we now have implied NotifyAccess=main since commit -d1740fb3d5a72cb49e30b330bb0b01e7ef3e09cc - -This leads to a timeout and killing samba process by systemd. Situation -is reproducible in Fedora 33, for example. - -Make sure that we have required status updates for all daemons in case -we aren't runnning in interactive mode. - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14552 - -Signed-off-by: Alexander Bokovoy ---- - source3/nmbd/nmbd.c | 4 +++- - source3/smbd/server.c | 4 +++- - source3/winbindd/winbindd.c | 5 ++++- - source4/smbd/server.c | 4 +++- - 4 files changed, 13 insertions(+), 4 deletions(-) - -diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c -index 0b881d13f7b..f6aeba1f714 100644 ---- a/source3/nmbd/nmbd.c -+++ b/source3/nmbd/nmbd.c -@@ -1009,6 +1009,8 @@ static bool open_sockets(bool isdaemon, int port) - if (is_daemon && !opt_interactive) { - DEBUG(3, ("Becoming a daemon.\n")); - become_daemon(Fork, no_process_group, log_stdout); -+ } else if (!opt_interactive) { -+ daemon_status("nmbd", "Starting process..."); - } - - #ifdef HAVE_SETPGID -@@ -1135,7 +1137,7 @@ static bool open_sockets(bool isdaemon, int port) - exit_daemon( "NMBD failed to setup packet server.", EACCES); - } - -- if (is_daemon && !opt_interactive) { -+ if (!opt_interactive) { - daemon_ready("nmbd"); - } - -diff --git a/source3/smbd/server.c b/source3/smbd/server.c -index 153dd3c9323..3d9db5d8407 100644 ---- a/source3/smbd/server.c -+++ b/source3/smbd/server.c -@@ -1893,6 +1893,8 @@ extern void build_options(bool screen); - if (is_daemon && !interactive) { - DEBUG(3, ("Becoming a daemon.\n")); - become_daemon(Fork, no_process_group, log_stdout); -+ } else { -+ daemon_status("smbd", "Starting process ..."); - } - - #ifdef HAVE_SETPGID -@@ -2100,7 +2102,7 @@ extern void build_options(bool screen); - exit_daemon("Samba cannot setup ep pipe", EACCES); - } - -- if (is_daemon && !interactive) { -+ if (!interactive) { - daemon_ready("smbd"); - } - -diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c -index 4397a1bc0d1..1e08237905a 100644 ---- a/source3/winbindd/winbindd.c -+++ b/source3/winbindd/winbindd.c -@@ -1880,8 +1880,11 @@ int main(int argc, const char **argv) - BlockSignals(False, SIGHUP); - BlockSignals(False, SIGCHLD); - -- if (!interactive) -+ if (!interactive) { - become_daemon(Fork, no_process_group, log_stdout); -+ } else { -+ daemon_status("winbindd", "Starting process ..."); -+ } - - pidfile_create(lp_pid_directory(), "winbindd"); - -diff --git a/source4/smbd/server.c b/source4/smbd/server.c -index 95acb99b86c..ee2e7508bb3 100644 ---- a/source4/smbd/server.c -+++ b/source4/smbd/server.c -@@ -648,6 +648,8 @@ static int binary_smbd_main(const char *binary_name, - if (opt_daemon) { - DBG_NOTICE("Becoming a daemon.\n"); - become_daemon(opt_fork, opt_no_process_group, false); -+ } else if (!opt_interactive) { -+ daemon_status("samba", "Starting process..."); - } - - /* Create the memory context to hang everything off. */ -@@ -931,7 +933,7 @@ static int binary_smbd_main(const char *binary_name, - } - } - -- if (opt_daemon) { -+ if (!opt_interactive) { - daemon_ready("samba"); - } - --- -2.28.0 - diff --git a/samba.spec b/samba.spec index b2d2670..cb0ce28 100644 --- a/samba.spec +++ b/samba.spec @@ -148,15 +148,6 @@ Source14: samba.pamd Source201: README.downgrade Patch1: samba-s4u.patch Patch2: samba-gc-lookup_unix_user_name-allow-lookup-for-own-realm.patch -Patch3: samba-dnspython-2.0.0-v4.13.patch -Patch4: samba-systemd-notification.patch - -# Fix `make test` in release tarballs -Patch5: https://gitlab.com/samba-team/samba/-/merge_requests/1624.patch -# Update resolv_wrapper to version 1.1.7 -Patch6: https://gitlab.com/samba-team/samba/-/merge_requests/1528.patch -# Do not install test binaries for selftest -Patch7: https://gitlab.com/samba-team/samba/-/merge_requests/1635.patch Requires(pre): /usr/sbin/groupadd Requires(post): systemd