Remove ntdb from scripts
authorVolker Lendecke <vl@samba.org>
Thu, 12 Mar 2015 13:18:34 +0000 (13:18 +0000)
committerMichael Adam <obnox@samba.org>
Tue, 17 Mar 2015 10:30:51 +0000 (11:30 +0100)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
examples/misc/adssearch.pl
python/samba/tests/upgradeprovision.py
python/samba/tests/upgradeprovisionneeddc.py
script/librelease.sh
selftest/target/Samba3.pm
testsuite/headers/wscript_build

index 02c4464..13a85be 100755 (executable)
@@ -42,13 +42,11 @@ my $rebind_url;
 
 
 my $tdbdump    = "/usr/bin/tdbdump";
-my $ntdbdump   = "/usr/bin/ntdbdump";
 my $testparm   = "/usr/bin/testparm";
 my $net                = "/usr/bin/net";
 my $dig                = "/usr/bin/dig";
 my $nmblookup  = "/usr/bin/nmblookup";
 my $secrets_tdb = "/etc/samba/secrets.tdb";
-my $secrets_ntdb = "/etc/samba/secrets.ntdb";
 my $klist      = "/usr/bin/klist";
 my $kinit      = "/usr/bin/kinit";
 my $workgroup  = "";
@@ -725,21 +723,13 @@ sub get_machine_password {
        my $workgroup = shift || "";
        $workgroup = uc($workgroup);
 
-       my ($found, $tmp, $dbdump, $db);
-       if (-r $secrets_ntdb) {
-           -x $ntdbdump || die "ntdbdump is not installed. cannot proceed autodetection\n";
-           $dbdump = $ntdbdump;
-           $db = $secrets_ntdb;
-       } else {
-           -x $tdbdump || die "tdbdump is not installed. cannot proceed autodetection\n";
-           -r $secrets_tdb || die "cannot read $secrets_tdb. cannot proceed autodetection\n";
-           $dbdump = $tdbdump;
-           $db = $secrets_tdb;
-       }
+       my ($found, $tmp);
+       -x $tdbdump || die "tdbdump is not installed. cannot proceed autodetection\n";
+       -r $secrets_tdb || die "cannot read $secrets_tdb. cannot proceed autodetection\n";
 
        # get machine-password
        my $key = sprintf("SECRETS/MACHINE_PASSWORD/%s", $workgroup);
-       open(SECRETS,"$dbdump $db |");
+       open(SECRETS,"$tdbdump $secrets_tdb |");
        while(my $line = <SECRETS>) {
                chomp($line);
                if ($found) {
index d785bc1..3c0bc2a 100644 (file)
@@ -147,7 +147,7 @@ class UpdateSecretsTests(samba.tests.TestCaseInTempDir):
         self.assertEquals(newmodules.msgs, refmodules.msgs)
 
     def tearDown(self):
-        for name in ["ref.ldb", "secrets.ldb", "secrets.tdb", "secrets.tdb.bak", "secrets.ntdb"]:
+        for name in ["ref.ldb", "secrets.ldb", "secrets.tdb", "secrets.tdb.bak"]:
             path = os.path.join(self.tempdir, name)
             if os.path.exists(path):
                 os.unlink(path)
index bf25453..914beeb 100644 (file)
@@ -172,7 +172,7 @@ class UpgradeProvisionWithLdbTestCase(TestCaseInTempDir):
         self.assertTrue(re.match(".*upgrade to.*", str(oem2)))
 
     def tearDown(self):
-        for name in ["ref.ldb", "secrets.ldb", "secrets.tdb", "secrets.tdb.bak", "secrets.ntdb", "sam.ldb"]:
+        for name in ["ref.ldb", "secrets.ldb", "secrets.tdb", "secrets.tdb.bak", "sam.ldb"]:
             path = os.path.join(self.tempdir, name)
             if os.path.exists(path):
                 os.unlink(path)
index 7584e48..5119ca4 100755 (executable)
@@ -80,7 +80,7 @@ release_lib() {
 
 for lib in $*; do
     case $lib in
-       talloc | tdb | ntdb | tevent | ldb)
+       talloc | tdb | tevent | ldb)
            [ -z "$GPG_USER" ] && {
                GPG_USER='Samba Library Distribution Key <samba-bugs@samba.org>'
            }
index 097d90a..0c48dda 100755 (executable)
@@ -607,9 +607,6 @@ $ret->{USERNAME} = KTEST\\Administrator
        system("cp $self->{srcdir}/source3/selftest/ktest-secrets.tdb $prefix/private/secrets.tdb");
        chmod 0600, "$prefix/private/secrets.tdb";
 
-#Make sure there's no old ntdb file.
-       system("rm -f $prefix/private/secrets.ntdb");
-
 #This uses a pre-calculated krb5 credentials cache, obtained by running Samba4 with:
 # "--option=kdc:service ticket lifetime=239232" "--option=kdc:user ticket lifetime=239232" "--option=kdc:renewal lifetime=239232"
 #
index f612ad9..d0625a0 100644 (file)
@@ -8,10 +8,6 @@ def build_test_headers(task):
     f.write('/* generated header test */\n')
     hlist = task.env.public_headers_list[:]
     hlist.sort()
-    # We need to include tdb.h before ntdb.h.  It's the rules!
-    if 'tdb.h' in hlist and 'ntdb.h' in hlist:
-        hlist.remove('ntdb.h')
-        hlist.append('ntdb.h')
 
     for h in hlist:
         f.write('#include "%s"\n' % os.path.normpath(h))