sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

Remove ntdb from scripts

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Volker Lendecke 2015-03-12 13:18:34 +00:00 committed by Michael Adam
parent e3d2e6a288
commit 89052936ae
6 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/misc/adssearch.pl
View File

@ -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) {

2
python/samba/tests/upgradeprovision.py
View 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)

2
python/samba/tests/upgradeprovisionneeddc.py
View 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)

2
script/librelease.sh
View File

@ -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>'
}

3
selftest/target/Samba3.pm
View File

@ -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"
#

4
testsuite/headers/wscript_build
View 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))