diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-11-17 10:37:04 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-11-17 10:38:09 +1100 |
| commit | b13518e4e89f887d01cdc0a52f3288d6ee9e87a1 (patch) | |
| tree | 5a4b3d7ca9552505ffb112728e9d8396ebd1f7ef | |
| parent | 5c3ef6dbaecb032a33351bea04f044ce9fd2fc8d (diff) | |
| download | samba-b13518e4e89f887d01cdc0a52f3288d6ee9e87a1.tar.gz samba-b13518e4e89f887d01cdc0a52f3288d6ee9e87a1.tar.bz2 samba-b13518e4e89f887d01cdc0a52f3288d6ee9e87a1.zip | |
s4:dsdb With these workarounds, we now pass the RPC-DSSYNC test
| -rw-r--r-- | source4/selftest/knownfail | 1 | ||||
| -rw-r--r-- | source4/torture/rpc/dssync.c | 17 |
2 files changed, 15 insertions, 3 deletions
diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail index 527f2cd111..15174fe2f8 100644 --- a/source4/selftest/knownfail +++ b/source4/selftest/knownfail @@ -19,7 +19,6 @@ rpc.handles.*.mixed-shared rpc.epmapper.*.Insert rpc.epmapper.*.InqObject rpc.dfs.* -rpc.dssync # Needs fixes in Samba4's provision to pass rpc.drsuapi.* rpc.lsalookup rpc.cracknames diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c index 907474fc57..280f478e4f 100644 --- a/source4/torture/rpc/dssync.c +++ b/source4/torture/rpc/dssync.c @@ -512,9 +512,18 @@ static bool test_analyse_objects(struct torture_context *tctx, ldap_msg = res->msgs[0]; for (j=0; j < ldap_msg->num_elements; j++) { ldap_msg->elements[j].flags = LDB_FLAG_MOD_ADD; + /* For unknown reasons, there is no nTSecurityDescriptor on cn=deleted objects over LDAP, but there is over DRS! Skip it on both transports for now here so */ + if ((ldb_attr_cmp(ldap_msg->elements[j].name, "nTSecurityDescriptor") == 0) && + (ldb_dn_compare(ldap_msg->dn, deleted_dn) == 0)) { + ldb_msg_remove_element(ldap_msg, &ldap_msg->elements[j]); + /* Don't skip one */ + j--; + } } drs_msg = ldb_msg_canonicalize(ldb, objs->objects[i].msg); + talloc_steal(search_req, drs_msg); + for (j=0; j < drs_msg->num_elements; j++) { if (drs_msg->elements[j].num_values == 0) { ldb_msg_remove_element(drs_msg, &drs_msg->elements[j]); @@ -522,8 +531,8 @@ static bool test_analyse_objects(struct torture_context *tctx, j--; /* For unknown reasons, there is no nTSecurityDescriptor on cn=deleted objects over LDAP, but there is over DRS! */ - } else if (ldb_attr_cmp(drs_msg->elements[j].name, "nTSecurityDescriptor") == 0 && - ldb_dn_compare(drs_msg->dn, deleted_dn) == 0) { + } else if ((ldb_attr_cmp(drs_msg->elements[j].name, "nTSecurityDescriptor") == 0) && + (ldb_dn_compare(drs_msg->dn, deleted_dn) == 0)) { ldb_msg_remove_element(drs_msg, &drs_msg->elements[j]); /* Don't skip one */ j--; @@ -562,10 +571,13 @@ static bool test_analyse_objects(struct torture_context *tctx, talloc_free(search_req); torture_assert_int_equal(tctx, new_msg->num_elements, 0, "Should have no objects in 'difference' message"); } + + /* search_req is used as a tmp talloc context in the above */ talloc_free(search_req); } if (!lp_parm_bool(tctx->lp_ctx, NULL, "dssync", "print_pwd_blobs", false)) { + talloc_free(objs); return true; } @@ -704,6 +716,7 @@ static bool test_analyse_objects(struct torture_context *tctx, talloc_free(ptr); } } + talloc_free(objs); return true; } |