summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamen Mazdrashki <kamen.mazdrashki@postpath.com>2009-12-18 03:58:29 +0200
committerAndrew Tridgell <tridge@samba.org>2009-12-21 23:44:19 +1100
commit14bac3a3e6a9308d9088559cf8f898b6ac4b4d68 (patch)
tree6e84d0b973dc3730f1d19da9da39d90ec9dde916
parentee48f583b5f7a7acdf4857d69db49dfa36992f4d (diff)
downloadsamba-14bac3a3e6a9308d9088559cf8f898b6ac4b4d68.tar.gz
samba-14bac3a3e6a9308d9088559cf8f898b6ac4b4d68.tar.bz2
samba-14bac3a3e6a9308d9088559cf8f898b6ac4b4d68.zip
Revert "s4-drs: cope with bogus empty attributes from w2k8-r2"
This reverts commit 1287c1d115fb7e8f3954bc05ff65007968403a9c. Next patch should fix the "not recognized ATTIDs" problem Signed-off-by: Andrew Tridgell <tridge@samba.org>
-rw-r--r--source4/dsdb/repl/replicated_objects.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c
index abd3ac85da..c72b107b75 100644
--- a/source4/dsdb/repl/replicated_objects.c
+++ b/source4/dsdb/repl/replicated_objects.c
@@ -128,15 +128,6 @@ static WERROR dsdb_convert_object_ex(struct ldb_context *ldb,
}
status = dsdb_attribute_drsuapi_to_ldb(ldb, schema, a, msg->elements, e);
- if (!NT_STATUS_IS_OK(status) && a->value_ctr.num_values == 0) {
- /* w2k8-r2 occasionally sends bogus empty
- attributes with rubbish attribute IDs. The
- only think we can do is discard these */
- DEBUG(0,(__location__ ": Discarding bogus empty DsReplicaAttribute with attid 0x%x\n",
- a->attid));
- ZERO_STRUCTP(e);
- continue;
- }
W_ERROR_NOT_OK_RETURN(status);
m->attid = a->attid;
@@ -157,14 +148,6 @@ static WERROR dsdb_convert_object_ex(struct ldb_context *ldb,
}
}
- /* delete any empty elements */
- for (i=0; i < msg->num_elements; i++) {
- if (msg->elements[i].name == NULL) {
- ldb_msg_remove_element(msg, &msg->elements[i]);
- i--;
- }
- }
-
if (rdn_m) {
struct ldb_message_element *el;
el = ldb_msg_find_element(msg, rdn_attr->lDAPDisplayName);