summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2021-01-12 10:07:56 +0100
committerAndrew Bartlett <abartlet@samba.org>2021-04-28 03:43:34 +0000
commitc54d5dbe0ce86beb166728d5925afd4b6afe0f34 (patch)
tree1322cdacfc0e1d6576f75245421db6e2665bf373
parent24c4fcf811517593074a606d12327a3d2842c427 (diff)
downloadsamba-c54d5dbe0ce86beb166728d5925afd4b6afe0f34.tar.gz
selftest: Specify /dev/null as the smbd config file
smbd will require a smb.conf later. Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rwxr-xr-xscript/autobuild.py2
-rwxr-xr-xselftest/target/Samba3.pm2
2 files changed, 2 insertions, 2 deletions
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 (<IN>) {