Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
my $tdbdump = "/usr/bin/tdbdump";
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 $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 = "";
my $klist = "/usr/bin/klist";
my $kinit = "/usr/bin/kinit";
my $workgroup = "";
my $workgroup = shift || "";
$workgroup = uc($workgroup);
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);
# 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) {
while(my $line = <SECRETS>) {
chomp($line);
if ($found) {
self.assertEquals(newmodules.msgs, refmodules.msgs)
def tearDown(self):
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)
path = os.path.join(self.tempdir, name)
if os.path.exists(path):
os.unlink(path)
self.assertTrue(re.match(".*upgrade to.*", str(oem2)))
def tearDown(self):
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)
path = os.path.join(self.tempdir, name)
if os.path.exists(path):
os.unlink(path)
for lib in $*; do
case $lib in
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>'
}
[ -z "$GPG_USER" ] && {
GPG_USER='Samba Library Distribution Key <samba-bugs@samba.org>'
}
system("cp $self->{srcdir}/source3/selftest/ktest-secrets.tdb $prefix/private/secrets.tdb");
chmod 0600, "$prefix/private/secrets.tdb";
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"
#
#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"
#
f.write('/* generated header test */\n')
hlist = task.env.public_headers_list[:]
hlist.sort()
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))
for h in hlist:
f.write('#include "%s"\n' % os.path.normpath(h))