summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-09-23 13:54:47 -0700
committerAndrew Tridgell <tridge@samba.org>2009-09-23 14:01:30 -0700
commit075f9e2c2919207fdf28cf0a7c19df12f5a809d2 (patch)
treedd3f6587bf7b2163a02d28ed278a38ea642f9b82
parent6fba3a22fecc8126fb2f8aa4c518dbf0bbfdef80 (diff)
downloadsamba-075f9e2c2919207fdf28cf0a7c19df12f5a809d2.tar.gz
samba-075f9e2c2919207fdf28cf0a7c19df12f5a809d2.tar.bz2
samba-075f9e2c2919207fdf28cf0a7c19df12f5a809d2.zip
s4-dsdb: cope with windows sending extra pad bytes
-rw-r--r--source4/dsdb/schema/schema_syntax.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c
index d5f7e6b489..c564471d4b 100644
--- a/source4/dsdb/schema/schema_syntax.c
+++ b/source4/dsdb/schema/schema_syntax.c
@@ -1067,10 +1067,10 @@ static WERROR dsdb_syntax_DN_drsuapi_to_ldb(struct ldb_context *ldb,
}
-
- ndr_err = ndr_pull_struct_blob_all(in->value_ctr.values[i].blob,
- tmp_ctx, schema->iconv_convenience, &id3,
- (ndr_pull_flags_fn_t)ndr_pull_drsuapi_DsReplicaObjectIdentifier3);
+ /* windows sometimes sends an extra two pad bytes here */
+ ndr_err = ndr_pull_struct_blob(in->value_ctr.values[i].blob,
+ tmp_ctx, schema->iconv_convenience, &id3,
+ (ndr_pull_flags_fn_t)ndr_pull_drsuapi_DsReplicaObjectIdentifier3);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
talloc_free(tmp_ctx);