From 63c20026c4c27beffbcdb962da7bd844c2ed9c97 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 30 Jul 2007 10:05:47 +0000 Subject: r24076: Make ldap.js pass against Win2k3 again (looks like we don't match AD on this error code, but allow both for now). Also prove that bug #4829 needs a different solution: we can't fix this by changing the template. I think this fix needs to be in the SAMR server. Andrew Bartlett (This used to be commit c3554e3ee79cdb15f05e7968ccde62c086748c80) --- testprogs/ejs/ldap.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'testprogs/ejs') diff --git a/testprogs/ejs/ldap.js b/testprogs/ejs/ldap.js index a91285c3af..bb7e482ec8 100755 --- a/testprogs/ejs/ldap.js +++ b/testprogs/ejs/ldap.js @@ -190,7 +190,11 @@ cn: LDAPtestUSER3 } assert(ok.error == 68); ok = ldb.rename("cn=ldaptestuser3,cn=users," + base_dn, "cn=ldaptestuser3,cn=configuration," + base_dn); - assert(ok.error == 71); + if (ok.error != 71 && ok.error != 64) { + println("expected error LDB_ERR_ENTRY_ALREADY_EXISTS or LDAP_NAMING_VIOLATION, got: " + ok.errstr); + assert(ok.error == 71 || ok.error == 64); + } + assert(ok.error == 71 || ok.error == 64); ok = ldb.del("cn=ldaptestuser3,cn=users," + base_dn); @@ -328,6 +332,7 @@ objectClass: user 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].primaryGroupID == 513); // assert(res.msgs[0].sAMAccountType == 805306368); // assert(res.msgs[0].userAccountControl == 546); -- cgit