From 08019a0973fb2ccf1ee4fa8c6523808033058456 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Sun, 11 Dec 2011 01:01:46 +1030 Subject: tdb2: don't use TDB2 versions of test tdb files. Now tdb2 handles tdb1 files, we don't need most of commit 5eecc854236f0b943aaa89e0c3a46f9fbd208ca9 which added TDB2 versions of all the testing tdbs. Signed-off-by: Rusty Russell Autobuild-User: Rusty Russell Autobuild-Date: Mon Dec 12 06:33:44 CET 2011 on sn-devel-104 --- selftest/target/Samba3.pm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'selftest/target') diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 3c0fbe9220..211bbb6a89 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -451,11 +451,7 @@ $ret->{USERNAME} = KTEST\\Administrator #Samba4 DC with the same parameters as are being used here. The #domain SID is S-1-5-21-1071277805-689288055-3486227160 - if (defined($ENV{BUILD_TDB2})) { - system("cp $self->{srcdir}/source3/selftest/ktest-secrets.tdb2 $prefix/private/secrets.tdb"); - } else { - system("cp $self->{srcdir}/source3/selftest/ktest-secrets.tdb $prefix/private/secrets.tdb"); - } + system("cp $self->{srcdir}/source3/selftest/ktest-secrets.tdb $prefix/private/secrets.tdb"); chmod 0600, "$prefix/private/secrets.tdb"; #This uses a pre-calculated krb5 credentials cache, obtained by running Samba4 with: -- cgit