From: Andreas Schneider Date: Tue, 12 Jan 2021 09:07:56 +0000 (+0100) Subject: selftest: Specify /dev/null as the smbd config file X-Git-Tag: tevent-0.11.0~998 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c54d5dbe0ce86beb166728d5925afd4b6afe0f34;p=thirdparty%2Fsamba.git selftest: Specify /dev/null as the smbd config file smbd will require a smb.conf later. Signed-off-by: Andreas Schneider Reviewed-by: Andrew Bartlett --- diff --git a/script/autobuild.py b/script/autobuild.py index a340160f20f..6eb8c4124e8 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -761,7 +761,7 @@ tasks = { "--without-ad-dc " "--bundled-libraries=!tdb"), ("samba-make", "make"), - ("samba-check", "./bin/smbd -b | grep CLUSTER_SUPPORT"), + ("samba-check", "./bin/smbd --configfile=/dev/null -b | grep CLUSTER_SUPPORT"), ("samba-install", "make install"), ("ctdb-check", "test -e ${PREFIX_DIR}/sbin/ctdbd"), diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 39a67377d19..87e0f6e5e98 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -27,7 +27,7 @@ sub return_alias_env sub have_ads($) { my ($self) = @_; my $found_ads = 0; - my $smbd_build_options = Samba::bindir_path($self, "smbd") . " -b|"; + my $smbd_build_options = Samba::bindir_path($self, "smbd") . " --configfile=/dev/null -b|"; open(IN, $smbd_build_options) or die("Unable to run $smbd_build_options: $!"); while () {