]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
selftest: Specify /dev/null as the smbd config file
authorAndreas Schneider <asn@samba.org>
Tue, 12 Jan 2021 09:07:56 +0000 (10:07 +0100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 28 Apr 2021 03:43:34 +0000 (03:43 +0000)
smbd will require a smb.conf later.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
script/autobuild.py
selftest/target/Samba3.pm

index a340160f20f52a5aed82913b7769f55b01ea7428..6eb8c4124e807141b1fedfab07eee72c2731508a 100755 (executable)
@@ -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"),
 
index 39a67377d19825755436ff647cd5853abfc6b746..87e0f6e5e987b434697abc5941e25a15f21a5fed 100755 (executable)
@@ -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>) {