Author: abartlet Date: 2007-07-30 10:05:47 +0000 (Mon, 30 Jul 2007) New Revision: 24076
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24076 Log: 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 Modified: branches/SAMBA_4_0/testprogs/ejs/ldap.js Changeset: Modified: branches/SAMBA_4_0/testprogs/ejs/ldap.js =================================================================== --- branches/SAMBA_4_0/testprogs/ejs/ldap.js 2007-07-30 09:04:28 UTC (rev 24075) +++ branches/SAMBA_4_0/testprogs/ejs/ldap.js 2007-07-30 10:05:47 UTC (rev 24076) @@ -190,7 +190,11 @@ } 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 @@ 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);
