summaryrefslogtreecommitdiff
path: root/testprogs/ejs/ldap.js
diff options
context:
space:
mode:
Diffstat (limited to 'testprogs/ejs/ldap.js')
-rwxr-xr-xtestprogs/ejs/ldap.js372
1 files changed, 199 insertions, 173 deletions
diff --git a/testprogs/ejs/ldap.js b/testprogs/ejs/ldap.js
index 1b7a8f891e..67eb28f6e3 100755
--- a/testprogs/ejs/ldap.js
+++ b/testprogs/ejs/ldap.js
@@ -37,11 +37,11 @@ objectClass: user
objectClass: person
cn: LDAPtestUSER
");
- if (!ok) {
+ if (ok.error != 0) {
ok = ldb.del("cn=ldaptestuser,cn=users," + base_dn);
- if (!ok) {
- println(ldb.errstring());
- assert(ok);
+ if (ok.error != 0) {
+ println(ok.errstr);
+ assert(ok.error == 0);
}
ok = ldb.add("
dn: cn=ldaptestuser,cn=users," + base_dn + "
@@ -49,9 +49,9 @@ objectClass: user
objectClass: person
cn: LDAPtestUSER
");
- if (!ok) {
- println(ldb.errstring());
- assert(ok);
+ if (ok.error != 0) {
+ println(ok.errstr);
+ assert(ok.error == 0);
}
}
@@ -60,20 +60,20 @@ dn: cn=ldaptestcomputer,cn=computers," + base_dn + "
objectClass: computer
cn: LDAPtestCOMPUTER
");
- if (!ok) {
+ if (ok.error != 0) {
ok = ldb.del("cn=ldaptestcomputer,cn=computers," + base_dn);
- if (!ok) {
- println(ldb.errstring());
- assert(ok);
+ if (ok.error != 0) {
+ println(ok.errstr);
+ assert(ok.error == 0);
}
ok = ldb.add("
dn: cn=ldaptestcomputer,cn=computers," + base_dn + "
objectClass: computer
cn: LDAPtestCOMPUTER
");
- if (!ok) {
- println(ldb.errstring());
- assert(ok);
+ if (ok.error != 0) {
+ println(ok.errstr);
+ assert(ok.error == 0);
}
}
@@ -83,11 +83,11 @@ objectClass: computer
cn: LDAPtest2COMPUTER
userAccountControl: 4096
");
- if (!ok) {
+ if (ok.error != 0) {
ok = ldb.del("cn=ldaptest2computer,cn=computers," + base_dn);
- if (!ok) {
- println(ldb.errstring());
- assert(ok);
+ if (ok.error != 0) {
+ println(ok.errstr);
+ assert(ok.error == 0);
}
ok = ldb.add("
dn: cn=ldaptest2computer,cn=computers," + base_dn + "
@@ -95,9 +95,9 @@ objectClass: computer
cn: LDAPtest2COMPUTER
userAccountControl: 4096
");
- if (!ok) {
- println(ldb.errstring());
- assert(ok);
+ if (ok.error != 0) {
+ println(ok.errstr);
+ assert(ok.error == 0);
}
}
@@ -107,11 +107,11 @@ objectClass: person
objectClass: user
cn: LDAPtestUSER2
");
- if (!ok) {
+ if (ok.error != 0) {
ok = ldb.del("cn=ldaptestuser2,cn=users," + base_dn);
- if (!ok) {
- println(ldb.errstring());
- assert(ok);
+ if (ok.error != 0) {
+ println(ok.errstr);
+ assert(ok.error == 0);
}
ok = ldb.add("
dn: cn=ldaptestuser2,cn=users," + base_dn + "
@@ -119,9 +119,9 @@ objectClass: person
objectClass: user
cn: LDAPtestUSER2
");
- if (!ok) {
- println(ldb.errstring());
- assert(ok);
+ if (ok.error != 0) {
+ println(ok.errstr);
+ assert(ok.error == 0);
}
}
@@ -129,19 +129,19 @@ cn: LDAPtestUSER2
dn: cn=ldaptestutf8user èùéìòà ,cn=users," + base_dn + "
objectClass: user
");
- if (!ok) {
+ if (ok.error != 0) {
ok = ldb.del("cn=ldaptestutf8user èùéìòà ,cn=users," + base_dn);
- if (!ok) {
- println(ldb.errstring());
- assert(ok);
+ if (ok.error != 0) {
+ println(ok.errstr);
+ assert(ok.error == 0);
}
ok = ldb.add("
dn: cn=ldaptestutf8user èùéìòà ,cn=users," + base_dn + "
objectClass: user
");
- if (!ok) {
- println(ldb.errstring());
- assert(ok);
+ if (ok.error != 0) {
+ println(ok.errstr);
+ assert(ok.error == 0);
}
}
@@ -149,276 +149,296 @@ objectClass: user
dn: cn=ldaptestutf8user2 èùéìòà ,cn=users," + base_dn + "
objectClass: user
");
- if (!ok) {
+ if (ok.error != 0) {
ok = ldb.del("cn=ldaptestutf8user2 èùéìòà ,cn=users," + base_dn);
- if (!ok) {
- println(ldb.errstring());
- assert(ok);
+ if (ok.error != 0) {
+ println(ok.errstr);
+ assert(ok.error == 0);
}
ok = ldb.add("
dn: cn=ldaptestutf8user2 èùéìòà ,cn=users," + base_dn + "
objectClass: user
");
- if (!ok) {
- println(ldb.errstring());
- assert(ok);
+ if (ok.error != 0) {
+ println(ok.errstr);
+ assert(ok.error == 0);
}
}
println("Testing ldb.search for (&(cn=ldaptestuser)(objectClass=user))");
var res = ldb.search("(&(cn=ldaptestuser)(objectClass=user))");
- if (res.length != 1) {
+ if (res.error != 0 || res.msgs.length != 1) {
println("Could not find (&(cn=ldaptestuser)(objectClass=user))");
- assert(res.length == 1);
+ assert(res.error == 0);
+ assert(res.msgs.length == 1);
}
- assert(res[0].dn == "cn=ldaptestuser,cn=users," + base_dn);
- assert(res[0].cn == "ldaptestuser");
- assert(res[0].name == "ldaptestuser");
- assert(res[0].objectClass[0] == "top");
- assert(res[0].objectClass[1] == "person");
- assert(res[0].objectClass[2] == "organizationalPerson");
- assert(res[0].objectClass[3] == "user");
- assert(res[0].objectGUID != undefined);
- assert(res[0].whenCreated != undefined);
- assert(res[0].objectCategory == "cn=Person,cn=Schema,cn=Configuration," + base_dn);
- assert(res[0].sAMAccountType == 805306368);
+ assert(res.msgs[0].dn == "cn=ldaptestuser,cn=users," + base_dn);
+ assert(res.msgs[0].cn == "ldaptestuser");
+ assert(res.msgs[0].name == "ldaptestuser");
+ assert(res.msgs[0].objectClass[0] == "top");
+ assert(res.msgs[0].objectClass[1] == "person");
+ assert(res.msgs[0].objectClass[2] == "organizationalPerson");
+ assert(res.msgs[0].objectClass[3] == "user");
+ assert(res.msgs[0].objectGUID != undefined);
+ assert(res.msgs[0].whenCreated != undefined);
+ assert(res.msgs[0].objectCategory == "cn=Person,cn=Schema,cn=Configuration," + base_dn);
+ assert(res.msgs[0].sAMAccountType == 805306368);
// assert(res[0].userAccountControl == 546);
println("Testing ldb.search for (&(cn=ldaptestuser)(objectCategory=cn=person,cn=schema,cn=configuration," + base_dn + "))");
var res2 = ldb.search("(&(cn=ldaptestuser)(objectCategory=cn=person,cn=schema,cn=configuration," + base_dn + "))");
- if (res2.length != 1) {
+ if (res2.error != 0 || res2.msgs.length != 1) {
println("Could not find (&(cn=ldaptestuser)(objectCategory=cn=person,cn=schema,cn=configuration," + base_dn + "))");
- assert(res2.length == 1);
+ assert(res2.error == 0);
+ assert(res2.msgs.length == 1);
}
- assert(res[0].dn == res2[0].dn);
+ assert(res.msgs[0].dn == res2.msgs[0].dn);
println("Testing ldb.search for (&(cn=ldaptestuser)(objectCategory=PerSon))");
var res3 = ldb.search("(&(cn=ldaptestuser)(objectCategory=PerSon))");
- if (res3.length != 1) {
+ if (res3.error != 0 || res3.msgs.length != 1) {
println("Could not find (&(cn=ldaptestuser)(objectCategory=PerSon))");
- assert(res3.length == 1);
+ assert(res3.error == 0);
+ assert(res3.msgs.length == 1);
}
- assert(res[0].dn == res3[0].dn);
+ assert(res.msgs[0].dn == res3.msgs[0].dn);
if (gc_ldb != undefined) {
println("Testing ldb.search for (&(cn=ldaptestuser)(objectCategory=PerSon)) in Global Catalog");
var res3gc = gc_ldb.search("(&(cn=ldaptestuser)(objectCategory=PerSon))");
- if (res3gc.length != 1) {
+ if (res3gc.error != 0 || res3gc.msgs.length != 1) {
println("Could not find (&(cn=ldaptestuser)(objectCategory=PerSon)) in Global Catalog");
- assert(res3gc.length == 1);
+ assert(res3gc.error == 0);
+ assert(res3gc.msgs.length == 1);
}
- assert(res[0].dn == res3gc[0].dn);
+ assert(res.msgs[0].dn == res3gc.msgs[0].dn);
}
- ok = ldb.del(res[0].dn);
- if (!ok) {
- println(ldb.errstring());
- assert(ok);
+ ok = ldb.del(res.msgs[0].dn);
+ if (ok.error != 0) {
+ println(ok.errstr);
+ assert(ok.error == 0);
}
println("Testing ldb.search for (&(cn=ldaptestcomputer)(objectClass=user))");
var res = ldb.search("(&(cn=ldaptestcomputer)(objectClass=user))");
- if (res.length != 1) {
+ if (res.error != 0 || res.msgs.length != 1) {
println("Could not find (&(cn=ldaptestuser)(objectClass=user))");
- assert(res.length == 1);
+ assert(res.error == 0);
+ assert(res.msgs.length == 1);
}
- assert(res[0].dn == "cn=ldaptestcomputer,cn=computers," + base_dn);
- assert(res[0].cn == "ldaptestcomputer");
- assert(res[0].name == "ldaptestcomputer");
- assert(res[0].objectClass[0] == "top");
- assert(res[0].objectClass[1] == "person");
- assert(res[0].objectClass[2] == "organizationalPerson");
- assert(res[0].objectClass[3] == "user");
- assert(res[0].objectClass[4] == "computer");
- assert(res[0].objectGUID != undefined);
- assert(res[0].whenCreated != undefined);
- assert(res[0].objectCategory == "cn=Computer,cn=Schema,cn=Configuration," + base_dn);
-// assert(res[0].sAMAccountType == 805306368);
-// assert(res[0].userAccountControl == 546);
+ assert(res.msgs[0].dn == "cn=ldaptestcomputer,cn=computers," + base_dn);
+ assert(res.msgs[0].cn == "ldaptestcomputer");
+ assert(res.msgs[0].name == "ldaptestcomputer");
+ assert(res.msgs[0].objectClass[0] == "top");
+ assert(res.msgs[0].objectClass[1] == "person");
+ assert(res.msgs[0].objectClass[2] == "organizationalPerson");
+ assert(res.msgs[0].objectClass[3] == "user");
+ assert(res.msgs[0].objectClass[4] == "computer");
+ assert(res.msgs[0].objectGUID != undefined);
+ assert(res.msgs[0].whenCreated != undefined);
+ assert(res.msgs[0].objectCategory == "cn=Computer,cn=Schema,cn=Configuration," + base_dn);
+// assert(res.msgs[0].sAMAccountType == 805306368);
+// assert(res.msgs[0].userAccountControl == 546);
println("Testing ldb.search for (&(cn=ldaptestcomputer)(objectCategory=cn=computer,cn=schema,cn=configuration," + base_dn + "))");
var res2 = ldb.search("(&(cn=ldaptestcomputer)(objectCategory=cn=computer,cn=schema,cn=configuration," + base_dn + "))");
- if (res2.length != 1) {
+ if (res2.error != 0 || res2.msgs.length != 1) {
println("Could not find (&(cn=ldaptestcomputer)(objectCategory=cn=computer,cn=schema,cn=configuration," + base_dn + "))");
- assert(res2.length == 1);
+ assert(res2.error == 0);
+ assert(res2.msgs.length == 1);
}
- assert(res[0].dn == res2[0].dn);
+ assert(res.msgs[0].dn == res2.msgs[0].dn);
if (gc_ldb != undefined) {
println("Testing ldb.search for (&(cn=ldaptestcomputer)(objectCategory=cn=computer,cn=schema,cn=configuration," + base_dn + ")) in Global Catlog");
var res2gc = gc_ldb.search("(&(cn=ldaptestcomputer)(objectCategory=cn=computer,cn=schema,cn=configuration," + base_dn + "))");
- if (res2gc.length != 1) {
+ if (res2gc.error != 0 || res2gc.msgs.length != 1) {
println("Could not find (&(cn=ldaptestcomputer)(objectCategory=cn=computer,cn=schema,cn=configuration," + base_dn + ")) in Global Catlog");
- assert(res2gc.length == 1);
+ assert(res2gc.error == 0);
+ assert(res2gc.msgs.length == 1);
}
- assert(res[0].dn == res2gc[0].dn);
+ assert(res.msgs[0].dn == res2gc.msgs[0].dn);
}
println("Testing ldb.search for (&(cn=ldaptestcomputer)(objectCategory=compuTER))");
var res3 = ldb.search("(&(cn=ldaptestcomputer)(objectCategory=compuTER))");
- if (res3.length != 1) {
+ if (res3.error != 0 || res3.msgs.length != 1) {
println("Could not find (&(cn=ldaptestcomputer)(objectCategory=compuTER))");
- assert(res3.length == 1);
+ assert(res3.error == 0);
+ assert(res3.msgs.length == 1);
}
- assert(res[0].dn == res3[0].dn);
+ assert(res.msgs[0].dn == res3.msgs[0].dn);
if (gc_ldb != undefined) {
println("Testing ldb.search for (&(cn=ldaptestcomputer)(objectCategory=compuTER)) in Global Catalog");
var res3gc = gc_ldb.search("(&(cn=ldaptestcomputer)(objectCategory=compuTER))");
- if (res3gc.length != 1) {
+ if (res3gc.error != 0 || res3gc.msgs.length != 1) {
println("Could not find (&(cn=ldaptestcomputer)(objectCategory=compuTER)) in Global Catalog");
- assert(res3gc.length == 1);
+ assert(res3gc.error == 0);
+ assert(res3gc.msgs.length == 1);
}
- assert(res[0].dn == res3gc[0].dn);
+ assert(res.msgs[0].dn == res3gc.msgs[0].dn);
}
println("Testing ldb.search for (&(cn=ldaptestcomp*r)(objectCategory=compuTER))");
var res4 = ldb.search("(&(cn=ldaptestcomp*r)(objectCategory=compuTER))");
- if (res4.length != 1) {
+ if (res4.error != 0 || res4.msgs.length != 1) {
println("Could not find (&(cn=ldaptestcomp*r)(objectCategory=compuTER))");
- assert(res4.length == 1);
+ assert(res4.error == 0);
+ assert(res4.msgs.length == 1);
}
- assert(res[0].dn == res4[0].dn);
+ assert(res.msgs[0].dn == res4.msgs[0].dn);
println("Testing ldb.search for (&(cn=ldaptestcomput*)(objectCategory=compuTER))");
var res5 = ldb.search("(&(cn=ldaptestcomput*)(objectCategory=compuTER))");
- if (res5.length != 1) {
+ if (res5.error != 0 || res5.msgs.length != 1) {
println("Could not find (&(cn=ldaptestcomput*)(objectCategory=compuTER))");
- assert(res5.length == 1);
+ assert(res5.error == 0);
+ assert(res5.msgs.length == 1);
}
- assert(res[0].dn == res5[0].dn);
+ assert(res.msgs[0].dn == res5.msgs[0].dn);
println("Testing ldb.search for (&(cn=*daptestcomputer)(objectCategory=compuTER))");
var res6 = ldb.search("(&(cn=*daptestcomputer)(objectCategory=compuTER))");
- if (res6.length != 1) {
+ if (res6.error != 0 || res6.msgs.length != 1) {
println("Could not find (&(cn=*daptestcomputer)(objectCategory=compuTER))");
- assert(res6.length == 1);
+ assert(res6.error == 0);
+ assert(res6.msgs.length == 1);
}
- assert(res[0].dn == res6[0].dn);
+ assert(res.msgs[0].dn == res6.msgs[0].dn);
- ok = ldb.del(res[0].dn);
- if (!ok) {
- println(ldb.errstring());
- assert(ok);
+ ok = ldb.del(res.msgs[0].dn);
+ if (ok.error != 0) {
+ println(ok.errstr);
+ assert(ok.error == 0);
}
println("Testing ldb.search for (&(cn=ldaptest2computer)(objectClass=user))");
var res = ldb.search("(&(cn=ldaptest2computer)(objectClass=user))");
- if (res.length != 1) {
+ if (res.error != 0 || res.msgs.length != 1) {
println("Could not find (&(cn=ldaptest2computer)(objectClass=user))");
- assert(res.length == 1);
+ assert(res.error == 0);
+ assert(res.msgs.length == 1);
}
- assert(res[0].dn == "cn=ldaptest2computer,cn=computers," + base_dn);
- assert(res[0].cn == "ldaptest2computer");
- assert(res[0].name == "ldaptest2computer");
- assert(res[0].objectClass[0] == "top");
- assert(res[0].objectClass[1] == "person");
- assert(res[0].objectClass[2] == "organizationalPerson");
- assert(res[0].objectClass[3] == "user");
- assert(res[0].objectClass[4] == "computer");
- assert(res[0].objectGUID != undefined);
- assert(res[0].whenCreated != undefined);
- assert(res[0].objectCategory == "cn=Computer,cn=Schema,cn=Configuration," + base_dn);
- assert(res[0].sAMAccountType == 805306369);
-// assert(res[0].userAccountControl == 4098);
+ assert(res.msgs[0].dn == "cn=ldaptest2computer,cn=computers," + base_dn);
+ assert(res.msgs[0].cn == "ldaptest2computer");
+ assert(res.msgs[0].name == "ldaptest2computer");
+ assert(res.msgs[0].objectClass[0] == "top");
+ assert(res.msgs[0].objectClass[1] == "person");
+ assert(res.msgs[0].objectClass[2] == "organizationalPerson");
+ assert(res.msgs[0].objectClass[3] == "user");
+ assert(res.msgs[0].objectClass[4] == "computer");
+ assert(res.msgs[0].objectGUID != undefined);
+ assert(res.msgs[0].whenCreated != undefined);
+ assert(res.msgs[0].objectCategory == "cn=Computer,cn=Schema,cn=Configuration," + base_dn);
+ assert(res.msgs[0].sAMAccountType == 805306369);
+// assert(res.msgs[0].userAccountControl == 4098);
println("Testing ldb.search for (&(cn=ldaptestUSer2)(objectClass=user))");
var res = ldb.search("(&(cn=ldaptestUSer2)(objectClass=user))");
- if (res.length != 1) {
+ if (res.error != 0 || res.msgs.length != 1) {
println("Could not find (&(cn=ldaptestUSer2)(objectClass=user))");
- assert(res.length == 1);
+ assert(res.error == 0);
+ assert(res.msgs.length == 1);
}
- assert(res[0].dn == "cn=ldaptestuser2,cn=users," + base_dn);
- assert(res[0].cn == "ldaptestuser2");
- assert(res[0].name == "ldaptestuser2");
- assert(res[0].objectClass[0] == "top");
- assert(res[0].objectClass[1] == "person");
- assert(res[0].objectClass[2] == "organizationalPerson");
- assert(res[0].objectClass[3] == "user");
- assert(res[0].objectGUID != undefined);
- assert(res[0].whenCreated != undefined);
-
- ok = ldb.del(res[0].dn);
- if (!ok) {
- println(ldb.errstring());
- assert(ok);
+ assert(res.msgs[0].dn == "cn=ldaptestuser2,cn=users," + base_dn);
+ assert(res.msgs[0].cn == "ldaptestuser2");
+ assert(res.msgs[0].name == "ldaptestuser2");
+ assert(res.msgs[0].objectClass[0] == "top");
+ assert(res.msgs[0].objectClass[1] == "person");
+ assert(res.msgs[0].objectClass[2] == "organizationalPerson");
+ assert(res.msgs[0].objectClass[3] == "user");
+ assert(res.msgs[0].objectGUID != undefined);
+ assert(res.msgs[0].whenCreated != undefined);
+
+ ok = ldb.del(res.msgs[0].dn);
+ if (ok.error != 0) {
+ println(ok.errstr);
+ assert(ok.error == 0);
}
println("Testing ldb.search for (&(cn=ldaptestutf8user ÈÙÉÌÒÀ)(objectClass=user))");
var res = ldb.search("(&(cn=ldaptestutf8user ÈÙÉÌÒÀ)(objectClass=user))");
- if (res.length != 1) {
+ if (res.error != 0 || res.msgs.length != 1) {
println("Could not find (&(cn=ldaptestutf8user ÈÙÉÌÒÀ)(objectClass=user))");
- assert(res.length == 1);
+ assert(res.error == 0);
+ assert(res.msgs.length == 1);
}
- assert(res[0].dn == "cn=ldaptestutf8user èùéìòà,cn=users," + base_dn);
- assert(res[0].cn == "ldaptestutf8user èùéìòà");
- assert(res[0].name == "ldaptestutf8user èùéìòà");
- assert(res[0].objectClass[0] == "top");
- assert(res[0].objectClass[1] == "person");
- assert(res[0].objectClass[2] == "organizationalPerson");
- assert(res[0].objectClass[3] == "user");
- assert(res[0].objectGUID != undefined);
- assert(res[0].whenCreated != undefined);
-
- ok = ldb.del(res[0].dn);
- if (!ok) {
- println(ldb.errstring());
- assert(ok);
+ assert(res.msgs[0].dn == "cn=ldaptestutf8user èùéìòà,cn=users," + base_dn);
+ assert(res.msgs[0].cn == "ldaptestutf8user èùéìòà");
+ assert(res.msgs[0].name == "ldaptestutf8user èùéìòà");
+ assert(res.msgs[0].objectClass[0] == "top");
+ assert(res.msgs[0].objectClass[1] == "person");
+ assert(res.msgs[0].objectClass[2] == "organizationalPerson");
+ assert(res.msgs[0].objectClass[3] == "user");
+ assert(res.msgs[0].objectGUID != undefined);
+ assert(res.msgs[0].whenCreated != undefined);
+
+ ok = ldb.del(res.msgs[0].dn);
+ if (ok.error != 0) {
+ println(ok.errstr);
+ assert(ok.error == 0);
}
println("Testing ldb.search for (&(cn=ldaptestutf8user2 ÈÙÉÌÒÀ)(objectClass=user))");
var res = ldb.search("(&(cn=ldaptestutf8user ÈÙÉÌÒÀ)(objectClass=user))");
- if (res.length != 1) {
+ if (res.error != 0 || res.msgs.length != 1) {
println("Could not find (expect space collapse, win2k3 fails) (&(cn=ldaptestutf8user2 ÈÙÉÌÒÀ)(objectClass=user))");
} else {
- assert(res[0].dn == "cn=ldaptestutf8user2 èùéìòà,cn=users," + base_dn);
- assert(res[0].cn == "ldaptestutf8user2 èùéìòà");
+ assert(res.msgs[0].dn == "cn=ldaptestutf8user2 èùéìòà,cn=users," + base_dn);
+ assert(res.msgs[0].cn == "ldaptestutf8user2 èùéìòà");
}
println("Testing that we can't get at the configuration DN from the main search base");
var attrs = new Array("cn");
var res = ldb.search("objectClass=crossRef", base_dn, ldb.SCOPE_SUBTREE, attrs);
- assert (res.length == 0);
+ assert(res.error == 0);
+ assert(res.msgs.length == 0);
if (gc_ldb != undefined) {
println("Testing that we do find configuration elements in the global catlog");
var attrs = new Array("cn");
var res = gc_ldb.search("objectClass=crossRef", base_dn, ldb.SCOPE_SUBTREE, attrs);
- assert (res.length > 0);
+ assert(res.error == 0);
+ assert (res.msgs.length > 0);
println("Testing that we do find configuration elements and user elements at the same time");
var attrs = new Array("cn");
var res = gc_ldb.search("(|(objectClass=crossRef)(objectClass=person))", base_dn, ldb.SCOPE_SUBTREE, attrs);
- assert (res.length > 0);
+ assert(res.error == 0);
+ assert (res.msgs.length > 0);
println("Testing that we do find configuration elements in the global catlog, with the configuration basedn");
var attrs = new Array("cn");
var res = gc_ldb.search("objectClass=crossRef", configuration_dn, ldb.SCOPE_SUBTREE, attrs);
- assert (res.length > 0);
+ assert(res.error == 0);
+ assert (res.msgs.length > 0);
}
println("Testing that we can get at the configuration DN on the main LDAP port");
var attrs = new Array("cn");
var res = ldb.search("objectClass=crossRef", configuration_dn, ldb.SCOPE_SUBTREE, attrs);
- assert (res.length > 0);
+ assert(res.error == 0);
+ assert (res.msgs.length > 0);
}
@@ -427,40 +447,46 @@ function basedn_tests(ldb, gc_ldb)
println("Testing for all rootDSE attributes");
var attrs = new Array();
var res = ldb.search("", "", ldb.SCOPE_BASE, attrs);
- assert(res.length == 1);
+ assert(res.error == 0);
+ assert(res.msgs.length == 1);
println("Testing for highestCommittedUSN");
var attrs = new Array("highestCommittedUSN");
var res = ldb.search("", "", ldb.SCOPE_BASE, attrs);
- assert(res.length == 1);
- assert(res[0].highestCommittedUSN != undefined);
- assert(res[0].highestCommittedUSN != 0);
+ assert(res.error == 0);
+ assert(res.msgs.length == 1);
+ assert(res.msgs[0].highestCommittedUSN != undefined);
+ assert(res.msgs[0].highestCommittedUSN != 0);
println("Testing for netlogon via LDAP");
var attrs = new Array("netlogon");
var res = ldb.search("", "", ldb.SCOPE_BASE, attrs);
- assert(res.length == 0);
+ assert(res.error == 0);
+ assert(res.msgs.length == 0);
println("Testing for netlogon and highestCommittedUSN via LDAP");
var attrs = new Array("netlogon", "highestCommittedUSN");
var res = ldb.search("", "", ldb.SCOPE_BASE, attrs);
- assert(res.length == 0);
+ assert(res.error == 0);
+ assert(res.msgs.length == 0);
}
function find_basedn(ldb)
{
var attrs = new Array("defaultNamingContext");
var res = ldb.search("", "", ldb.SCOPE_BASE, attrs);
- assert(res.length == 1);
- return res[0].defaultNamingContext;
+ assert(res.error == 0);
+ assert(res.msgs.length == 1);
+ return res.msgs[0].defaultNamingContext;
}
function find_configurationdn(ldb)
{
var attrs = new Array("configurationNamingContext");
var res = ldb.search("", "", ldb.SCOPE_BASE, attrs);
- assert(res.length == 1);
- return res[0].configurationNamingContext;
+ assert(res.error == 0);
+ assert(res.msgs.length == 1);
+ return res.msgs[0].configurationNamingContext;
}
/* use command line creds if available */