sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

r17597: fix prefix path handling

Browse Source 
(This used to be commit 25cde0f7300f37fec6c4a897ba0a80a3e5c26e15)
This commit is contained in:
Simo Sorce 2006-08-17 20:21:14 +00:00 committed by Gerald (Jerry) Carter
parent f41fc00624
commit 45719b6c80
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
testprogs/ejs/ldb.js
View File

@ -18,7 +18,7 @@ if (options == undefined) {
libinclude("base.js");
if (options.ARGV.length != 1) {
println("Usage: ldap.js <HOST>");
println("Usage: ldb.js <prefix>");
return -1;
}
@ -88,10 +88,10 @@ dn: cn=ROOTDSE
defaultNamingContext: cn=Test
dn: @PARTITION
partition: cn=SideTest:" + prefix + "testside.ldb
partition: cn=Sub,cn=PartTest:" + prefix + "testsub.ldb
partition: cn=PartTest:" + prefix + "testpartition.ldb
partition: cn=Sub,cn=Sub,cn=PartTest:" + prefix + "testsubsub.ldb
partition: cn=SideTest:" + prefix + "/" + "testside.ldb
partition: cn=Sub,cn=PartTest:" + prefix + "/" + "testsub.ldb
partition: cn=PartTest:" + prefix + "/" + "testpartition.ldb
partition: cn=Sub,cn=Sub,cn=PartTest:" + prefix + "/" + "testsubsub.ldb
replicateEntries: @SUBCLASSES
replicateEntries: @ATTRIBUTES
replicateEntries: @INDEXLIST
@ -349,31 +349,31 @@ caseattr2: Xz
sys = sys_init();
var dbfile = "test.ldb";
sys.unlink(prefix + dbfile);
sys.unlink(prefix + "testpartition.ldb");
sys.unlink(prefix + "testsub.ldb");
sys.unlink(prefix + "testsubsub.ldb");
sys.unlink(prefix + "testside.ldb");
sys.unlink(prefix + "/" + dbfile);
sys.unlink(prefix + "/" + "testpartition.ldb");
sys.unlink(prefix + "/" + "testsub.ldb");
sys.unlink(prefix + "/" + "testsubsub.ldb");
sys.unlink(prefix + "/" + "testside.ldb");
var ok = ldb.connect("tdb://" + prefix + dbfile);
var ok = ldb.connect("tdb://" + prefix + "/" + dbfile);
assert(ok);
basic_tests(ldb);
setup_modules(ldb);
ldb = ldb_init();
var ok = ldb.connect("tdb://" + prefix + dbfile);
var ok = ldb.connect("tdb://" + prefix + "/" + dbfile);
assert(ok);
parttestldb = ldb_init();
var ok = parttestldb.connect("tdb://" + prefix + "testpartition.ldb");
var ok = parttestldb.connect("tdb://" + prefix + "/" + "testpartition.ldb");
assert(ok);
modules_test(ldb, parttestldb);
sys.unlink(prefix + dbfile);
sys.unlink(prefix + "testpartition.ldb");
sys.unlink(prefix + "testsub.ldb");
sys.unlink(prefix + "testsubsub.ldb");
sys.unlink(prefix + "testside.ldb");
sys.unlink(prefix + "/" + dbfile);
sys.unlink(prefix + "/" + "testpartition.ldb");
sys.unlink(prefix + "/" + "testsub.ldb");
sys.unlink(prefix + "/" + "testsubsub.ldb");
sys.unlink(prefix + "/" + "testside.ldb");
return 0;

10
testprogs/ejs/samba3sam.js
View File

@ -27,7 +27,7 @@ prefix = options.ARGV[0];
datadir = options.ARGV[1];
function setup_modules(sys, ldb, from, to) {
var ldif = sys.file_load(datadir + "provision_samba3sam.ldif");
var ldif = sys.file_load(datadir + "/" + "provision_samba3sam.ldif");
ldif = substitute_var(ldif, from);
assert(ldif != undefined);
var ok = ldb.add(ldif);
@ -52,7 +52,7 @@ replicateEntries: @INDEXLIST
}
function setup_data(sys, ldb, remote) {
var ldif = sys.file_load(datadir + "samba3.ldif");
var ldif = sys.file_load(datadir + "/" + "samba3.ldif");
ldif = substitute_var(ldif, remote);
assert(ldif != undefined);
var ok = ldb.add(ldif);
@ -216,16 +216,16 @@ delete: description
}
sys = sys_init();
var ldbfile = prefix + "test.ldb";
var ldbfile = prefix + "/" + "test.ldb";
var ldburl = "tdb://" + ldbfile;
var samba4 = new Object("samba4 partition info");
var samba4.FILE = prefix + "samba4.ldb";
var samba4.FILE = prefix + "/" + "samba4.ldb";
var samba4.URL = "tdb://" + samba4.FILE;
var samba4.BASEDN = "dc=vernstok,dc=nl";
var samba3 = new Object("samba3 partition info");
var samba3.FILE = prefix + "samba3.ldb";
var samba3.FILE = prefix + "/" + "samba3.ldb";
var samba3.URL = "tdb://" + samba3.FILE;
var samba3.BASEDN = "cn=Samba3Sam," + samba4.BASEDN;