summaryrefslogtreecommitdiff
path: root/selftest/selftest.pl
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2014-09-10 11:00:28 +0200
committerAndrew Bartlett <abartlet@samba.org>2014-12-18 06:47:40 +0100
commit2e4c15110b8c3f079f32645660dfbb20e32877e5 (patch)
tree0387f4e076809f06234d8206d6e624f7181492bd /selftest/selftest.pl
parent4f6acb77ea23df8a5c19ad0156d5e3d70cbca44c (diff)
downloadsamba-2e4c15110b8c3f079f32645660dfbb20e32877e5.tar.gz
selftest: Use resolv_wrapper in the samba4 target.
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'selftest/selftest.pl')
-rwxr-xr-xselftest/selftest.pl18
1 files changed, 10 insertions, 8 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 841dc537241..25470265c1f 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -547,7 +547,6 @@ sub write_clientconf($$$)
state directory = $clientdir/statedir
cache directory = $clientdir/cachedir
ncalrpc dir = $clientdir/ncalrpcdir
- name resolve order = file bcast
panic action = $RealBin/gdb_backtrace \%d
max xmit = 32K
notify:inotify = false
@@ -558,7 +557,6 @@ sub write_clientconf($$$)
torture:basedir = $clientdir
#We don't want to pass our self-tests if the PAC code is wrong
gensec:require_pac = true
- resolv:host file = $prefix_abs/dns_host_file
#We don't want to run 'speed' tests for very long
torture:timelimit = 1
winbind separator = /
@@ -780,6 +778,10 @@ my @exported_envvars = (
"DC_USERNAME",
"DC_PASSWORD",
+ # UID/GID for rfc2307 mapping tests
+ "UID_RFC2307TEST",
+ "GID_RFC2307TEST",
+
# misc stuff
"KRB5_CONFIG",
"SELFTEST_WINBINDD_SOCKET_DIR",
@@ -787,13 +789,13 @@ my @exported_envvars = (
"NMBD_SOCKET_DIR",
"LOCAL_PATH",
- # nss_wrapper
- "NSS_WRAPPER_PASSWD",
- "NSS_WRAPPER_GROUP",
+ # nss_wrapper
+ "NSS_WRAPPER_PASSWD",
+ "NSS_WRAPPER_GROUP",
+ "NSS_WRAPPER_HOSTS",
- # UID/GID for rfc2307 mapping tests
- "UID_RFC2307TEST",
- "GID_RFC2307TEST"
+ # resolv_wrapper
+ "RESOLV_WRAPPER_CONF",
);
sub sighandler($)