summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristof Schmitt <christof.schmitt@us.ibm.com>2013-07-03 12:49:43 -0700
committerAndrew Bartlett <abartlet@samba.org>2013-07-27 08:31:14 +0200
commit73a9e6a73b3508fd689a18c72d0f5574f2fecf91 (patch)
treef88fd8608b28c8abc77b322ffa8a4521d0530b4b
parentf908e6b0c506b9f9ed03dde4696ec6190b0369c0 (diff)
downloadsamba-73a9e6a73b3508fd689a18c72d0f5574f2fecf91.tar.gz
samba-73a9e6a73b3508fd689a18c72d0f5574f2fecf91.tar.bz2
samba-73a9e6a73b3508fd689a18c72d0f5574f2fecf91.zip
selftest: Print error message when smbd does not have ADS support
When smbd cannot be compiled with ADS support, setting up the s3member environment fails with: samba: using 'standard' process model Samba can't provide environment 's3member' at /test/samba/selftest/target/Samba.pm line 44. Can't use string ("UNKNOWN") as a HASH ref while "strict refs" in use at /test/samba/selftest/selftest.pl line 852. samba: EOF on stdin - terminating Add an explicit error message for the missing ADS support to make this easier to debug and also avoid the warning about the hash reference: samba: using 'standard' process model Samba can't provide environment 's3member' at /test/samba/selftest/target/Samba.pm line 44. Unable to setup environment s3member at /test/samba/selftest/selftest.pl line 851. smbd does not have ADS support samba: EOF on stdin - terminating Signed-off-by: Christof Schmitt <christof.schmitt@us.ibm.com> Reviewed-by: Andreas Schneider <asn@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Sat Jul 27 08:31:14 CEST 2013 on sn-devel-104
-rwxr-xr-xselftest/selftest.pl4
-rwxr-xr-xselftest/target/Samba3.pm1
2 files changed, 4 insertions, 1 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index cc947a15ed..b60b76228d 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -847,7 +847,9 @@ if ($opt_testenv) {
my $testenv_vars = setup_env($testenv_name, $prefix);
- die("Unable to setup environment $testenv_name") unless ($testenv_vars);
+ if (not $testenv_vars or $testenv_vars eq "UNKNOWN") {
+ die("Unable to setup environment $testenv_name");
+ }
$ENV{PIDDIR} = $testenv_vars->{PIDDIR};
$ENV{ENVNAME} = $testenv_name;
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 26f5e92898..20587bf94d 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -25,6 +25,7 @@ sub have_ads($) {
close IN;
# If we were not built with ADS support, pretend we were never even available
+ print "smbd does not have ADS support\n" unless $found_ads;
return $found_ads;
}