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 <rusty@rustcorp.com.au>
Autobuild-User: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date: Mon Dec 12 06:33:44 CET 2011 on sn-devel-104

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 3c0fbe922095cf163ca9ac28df55f4231cd258ba..211bbb6a8903675986fc27c5811828f2df80a750 100755 (executable)
--- 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
 
 #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:
        chmod 0600, "$prefix/private/secrets.tdb";
 
 #This uses a pre-calculated krb5 credentials cache, obtained by running Samba4 with:

diff --git a/source3/selftest/ktest-secrets.tdb2 b/source3/selftest/ktest-secrets.tdb2
deleted file mode 100644 (file)
index 2af58b1..0000000
Binary files a/source3/selftest/ktest-secrets.tdb2 and /dev/null differ

diff --git a/source4/scripting/python/samba/samba3/__init__.py b/source4/scripting/python/samba/samba3/__init__.py
index dd2f927aa4ae3bbad98e8d44ca13b2b942032d26..a955be1a735f29c43c39be825f9cc2cdc3d3927e 100644 (file)
--- a/source4/scripting/python/samba/samba3/__init__.py
+++ b/source4/scripting/python/samba/samba3/__init__.py
@@ -53,12 +53,9 @@ class TdbDatabase(object):
     def __init__(self, file):
         """Open a file.
 
     def __init__(self, file):
         """Open a file.
 

-        :param file: Path of the file to open (appending "2" if TDB2 enabled).
+        :param file: Path of the file to open.

         """
         """

-        if tdb.__version__.startswith("2"):
-            self.tdb = tdb.Tdb(file + "2", flags=os.O_RDONLY)
-        else:
-            self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
+        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)

         self._check_version()
 
     def _check_version(self):
         self._check_version()
 
     def _check_version(self):

diff --git a/testdata/samba3/account_policy.tdb2 b/testdata/samba3/account_policy.tdb2
deleted file mode 100644 (file)
index 434787e..0000000
Binary files a/testdata/samba3/account_policy.tdb2 and /dev/null differ

diff --git a/testdata/samba3/group_mapping.tdb2 b/testdata/samba3/group_mapping.tdb2
deleted file mode 100644 (file)
index 1a6466e..0000000
Binary files a/testdata/samba3/group_mapping.tdb2 and /dev/null differ

diff --git a/testdata/samba3/passdb.tdb2 b/testdata/samba3/passdb.tdb2
deleted file mode 100644 (file)
index 4ef87ed..0000000
Binary files a/testdata/samba3/passdb.tdb2 and /dev/null differ

diff --git a/testdata/samba3/registry.tdb2 b/testdata/samba3/registry.tdb2
deleted file mode 100644 (file)
index d747c3d..0000000
Binary files a/testdata/samba3/registry.tdb2 and /dev/null differ

diff --git a/testdata/samba3/secrets.tdb2 b/testdata/samba3/secrets.tdb2
deleted file mode 100644 (file)
index 5f88d6a..0000000
Binary files a/testdata/samba3/secrets.tdb2 and /dev/null differ

diff --git a/testdata/samba3/share_info.tdb2 b/testdata/samba3/share_info.tdb2
deleted file mode 100644 (file)
index 96e4c7a..0000000
Binary files a/testdata/samba3/share_info.tdb2 and /dev/null differ

diff --git a/testdata/samba3/winbindd_idmap.tdb2 b/testdata/samba3/winbindd_idmap.tdb2
deleted file mode 100644 (file)
index a63d875..0000000
Binary files a/testdata/samba3/winbindd_idmap.tdb2 and /dev/null differ