summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-07-30 10:05:47 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:01:22 -0500
commit63c20026c4c27beffbcdb962da7bd844c2ed9c97 (patch)
tree47dbffecb1e5f2b2b432e2ecaac3c46283028c18
parentbd750a77c086da01a389f567b99cdbb7bf2bd7d9 (diff)
downloadsamba-63c20026c4c27beffbcdb962da7bd844c2ed9c97.tar.gz
samba-63c20026c4c27beffbcdb962da7bd844c2ed9c97.tar.bz2
samba-63c20026c4c27beffbcdb962da7bd844c2ed9c97.zip
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)
-rwxr-xr-xtestprogs/ejs/ldap.js7
1 files changed, 6 insertions, 1 deletions
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);