From eccb2d16dfb584ce4c38cd08235b9ab5eca6072c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 9 Jan 2007 11:15:56 +0000 Subject: r20629: add a wrapper function for ldb_extended(ldb, DSDB_EXTENDED_REPLICATED_OBJECTS_OID, out, &ext_res); which prepares the replicated objects, the repl_meta_data ldb module will then add the uSNCreated, uSNChanged and some other things and will apply the objects to the partition specific ldb metze (This used to be commit 48d568a75b8109807af29f5d9604240c20c1a116) --- source4/dsdb/repl/replicated_objects.c | 299 +++++++++++++++++++++++++++++++++ 1 file changed, 299 insertions(+) create mode 100644 source4/dsdb/repl/replicated_objects.c (limited to 'source4/dsdb/repl/replicated_objects.c') diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c new file mode 100644 index 0000000000..9c64381e46 --- /dev/null +++ b/source4/dsdb/repl/replicated_objects.c @@ -0,0 +1,299 @@ +/* + Unix SMB/CIFS mplementation. + Helper functions for applying replicated objects + + Copyright (C) Stefan Metzmacher 2007 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include "includes.h" +#include "dsdb/samdb/samdb.h" +#include "lib/ldb/include/ldb_errors.h" +#include "lib/util/dlinklist.h" +#include "librpc/gen_ndr/ndr_misc.h" +#include "librpc/gen_ndr/ndr_drsuapi.h" +#include "librpc/gen_ndr/ndr_drsblobs.h" + +static WERROR dsdb_convert_object(struct ldb_context *ldb, + const struct dsdb_schema *schema, + struct dsdb_extended_replicated_objects *ctr, + const struct drsuapi_DsReplicaObjectListItemEx *in, + TALLOC_CTX *mem_ctx, + struct dsdb_extended_replicated_object *out) +{ + NTSTATUS nt_status; + WERROR status; + uint32_t i; + struct ldb_message *msg; + struct replPropertyMetaDataBlob md; + struct ldb_val md_value; + struct drsuapi_DsReplicaObjMetaDataCtr mdc; + struct ldb_val guid_value; + NTTIME whenChanged = 0; + time_t whenChanged_t; + const char *whenChanged_s; + const char *rdn_name; + const struct ldb_val *rdn_value; + const struct dsdb_attribute *rdn_attr; + uint32_t rdn_attid; + struct drsuapi_DsReplicaAttribute *name_a; + struct drsuapi_DsReplicaMetaData *name_d; + struct replPropertyMetaData1 *rdn_m; + struct drsuapi_DsReplicaObjMetaData *rdn_mc; + int ret; + + if (!in->object.identifier) { + return WERR_FOOBAR; + } + + if (!in->object.identifier->dn || !in->object.identifier->dn[0]) { + return WERR_FOOBAR; + } + + msg = ldb_msg_new(mem_ctx); + W_ERROR_HAVE_NO_MEMORY(msg); + + msg->dn = ldb_dn_new(msg, ldb, in->object.identifier->dn); + W_ERROR_HAVE_NO_MEMORY(msg->dn); + + rdn_name = ldb_dn_get_rdn_name(msg->dn); + rdn_attr = dsdb_attribute_by_lDAPDisplayName(schema, rdn_name); + if (!rdn_attr) { + return WERR_FOOBAR; + } + rdn_attid = rdn_attr->attributeID_id; + rdn_value = ldb_dn_get_rdn_val(msg->dn); + + msg->num_elements = in->object.attribute_ctr.num_attributes; + msg->elements = talloc_array(msg, struct ldb_message_element, + msg->num_elements); + W_ERROR_HAVE_NO_MEMORY(msg->elements); + + for (i=0; i < msg->num_elements; i++) { + status = dsdb_attribute_drsuapi_to_ldb(schema, + &in->object.attribute_ctr.attributes[i], + msg->elements, &msg->elements[i]); + W_ERROR_NOT_OK_RETURN(status); + } + + if (in->object.attribute_ctr.num_attributes != 0 && !in->meta_data_ctr) { + return WERR_FOOBAR; + } + + if (in->object.attribute_ctr.num_attributes != in->meta_data_ctr->count) { + return WERR_FOOBAR; + } + + md.version = 1; + md.reserved = 0; + md.ctr.ctr1.count = in->meta_data_ctr->count; + md.ctr.ctr1.reserved = 0; + md.ctr.ctr1.array = talloc_array(mem_ctx, + struct replPropertyMetaData1, + md.ctr.ctr1.count + 1); + W_ERROR_HAVE_NO_MEMORY(md.ctr.ctr1.array); + + mdc.count = in->meta_data_ctr->count; + mdc.reserved = 0; + mdc.array = talloc_array(mem_ctx, + struct drsuapi_DsReplicaObjMetaData, + mdc.count + 1); + W_ERROR_HAVE_NO_MEMORY(mdc.array); + + for (i=0; i < in->meta_data_ctr->count; i++) { + struct drsuapi_DsReplicaAttribute *a; + struct drsuapi_DsReplicaMetaData *d; + struct replPropertyMetaData1 *m; + struct drsuapi_DsReplicaObjMetaData *mc; + + a = &in->object.attribute_ctr.attributes[i]; + d = &in->meta_data_ctr->meta_data[i]; + m = &md.ctr.ctr1.array[i]; + mc = &mdc.array[i]; + + m->attid = a->attid; + m->version = d->version; + m->orginating_time = d->orginating_time; + m->orginating_invocation_id = d->orginating_invocation_id; + m->orginating_usn = d->orginating_usn; + m->local_usn = 0; + + mc->attribute_name = dsdb_lDAPDisplayName_by_id(schema, a->attid); + mc->version = d->version; + mc->originating_last_changed = d->orginating_time; + mc->originating_dsa_invocation_id= d->orginating_invocation_id; + mc->originating_usn = d->orginating_usn; + mc->local_usn = 0; + + if (d->orginating_time > whenChanged) { + whenChanged = d->orginating_time; + } + + if (a->attid == DRSUAPI_ATTRIBUTE_name) { + name_a = a; + name_d = d; + rdn_m = &md.ctr.ctr1.array[md.ctr.ctr1.count]; + rdn_mc = &mdc.array[mdc.count]; + } + } + + if (!name_d) { + return WERR_FOOBAR; + } + + ret = ldb_msg_add_value(msg, rdn_attr->lDAPDisplayName, rdn_value, NULL); + if (ret != LDB_SUCCESS) { + return WERR_FOOBAR; + } + + nt_status = ndr_push_struct_blob(&guid_value, msg, &in->object.identifier->guid, + (ndr_push_flags_fn_t)ndr_push_GUID); + if (!NT_STATUS_IS_OK(nt_status)) { + return ntstatus_to_werror(nt_status); + } + ret = ldb_msg_add_value(msg, "objectGUID", &guid_value, NULL); + if (ret != LDB_SUCCESS) { + return WERR_FOOBAR; + } + + whenChanged_t = nt_time_to_unix(whenChanged); + whenChanged_s = ldb_timestring(msg, whenChanged_t); + W_ERROR_HAVE_NO_MEMORY(whenChanged_s); + ret = ldb_msg_add_string(msg, "whenChanged", whenChanged_s); + if (ret != LDB_SUCCESS) { + return WERR_FOOBAR; + } + + rdn_m->attid = rdn_attid; + rdn_m->version = name_d->version; + rdn_m->orginating_time = name_d->orginating_time; + rdn_m->orginating_invocation_id = name_d->orginating_invocation_id; + rdn_m->orginating_usn = name_d->orginating_usn; + rdn_m->local_usn = 0; + md.ctr.ctr1.count++; + + rdn_mc->attribute_name = rdn_attr->lDAPDisplayName; + rdn_mc->version = name_d->version; + rdn_mc->originating_last_changed = name_d->orginating_time; + rdn_mc->originating_dsa_invocation_id = name_d->orginating_invocation_id; + rdn_mc->originating_usn = name_d->orginating_usn; + rdn_mc->local_usn = 0; + mdc.count++; + + nt_status = ndr_push_struct_blob(&md_value, msg, &md, + (ndr_push_flags_fn_t)ndr_push_replPropertyMetaDataBlob); + if (!NT_STATUS_IS_OK(nt_status)) { + return ntstatus_to_werror(nt_status); + } + ret = ldb_msg_add_value(msg, "replPropertyMetaData", &md_value, NULL); + if (ret != LDB_SUCCESS) { + return WERR_FOOBAR; + } + + if (lp_parm_bool(-1, "become dc", "dump objects", False)) { + struct ldb_ldif ldif; + fprintf(stdout, "#\n"); + ldif.changetype = LDB_CHANGETYPE_NONE; + ldif.msg = msg; + ldb_ldif_write_file(ldb, stdout, &ldif); + NDR_PRINT_DEBUG(drsuapi_DsReplicaObjMetaDataCtr, &mdc); + } + + out->msg = msg; + return WERR_OK; +} + +WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb, + const char *partition_dn, + const struct dsdb_schema *schema, + uint32_t ctr_level, + const struct drsuapi_DsGetNCChangesCtr1 *ctr1, + const struct drsuapi_DsGetNCChangesCtr6 *ctr6, + TALLOC_CTX *mem_ctx, + struct dsdb_extended_replicated_objects **_out) +{ + WERROR status; + struct dsdb_extended_replicated_objects *out; + struct ldb_result *ext_res; + const struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr; + uint32_t object_count; + struct drsuapi_DsReplicaObjectListItemEx *first_object; + struct drsuapi_DsReplicaObjectListItemEx *cur; + uint32_t i; + int ret; + + switch (ctr_level) { + case 1: + mapping_ctr = &ctr1->mapping_ctr; + object_count = ctr1->object_count; + first_object = ctr1->first_object; + break; + case 6: + mapping_ctr = &ctr6->mapping_ctr; + object_count = ctr6->object_count; + first_object = ctr6->first_object; + break; + default: + return WERR_INVALID_PARAM; + } + + status = dsdb_verify_oid_mappings(schema, mapping_ctr); + W_ERROR_NOT_OK_RETURN(status); + + out = talloc_zero(mem_ctx, struct dsdb_extended_replicated_objects); + W_ERROR_HAVE_NO_MEMORY(out); + + out->partition_dn = ldb_dn_new(out, ldb, partition_dn); + W_ERROR_HAVE_NO_MEMORY(out->partition_dn); + + out->num_objects = object_count; + out->objects = talloc_array(out, + struct dsdb_extended_replicated_object, + out->num_objects); + W_ERROR_HAVE_NO_MEMORY(out->objects); + + for (i=0, cur = first_object; cur; cur = cur->next_object, i++) { + if (i == out->num_objects) { + return WERR_FOOBAR; + } + + status = dsdb_convert_object(ldb, schema, out, cur, out->objects, &out->objects[i]); + W_ERROR_NOT_OK_RETURN(status); + } + if (i != out->num_objects) { + return WERR_FOOBAR; + } + + /* TODO: handle linked attributes */ + + ret = ldb_extended(ldb, DSDB_EXTENDED_REPLICATED_OBJECTS_OID, out, &ext_res); + if (ret != LDB_SUCCESS) { + DEBUG(0,("Failed to apply records: %d\n", + ret)); + talloc_free(out); + return WERR_FOOBAR; + } + talloc_free(ext_res); + + if (_out) { + *_out = out; + } else { + talloc_free(out); + } + + return WERR_OK; +} -- cgit From 513a43fc23cb08e12a860f362fe51da22e4864b0 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 11 Jan 2007 09:45:30 +0000 Subject: r20680: prepare the helper functions for applying replicated objects to pass all needed info to the repl_meta_data module metze (This used to be commit d5db31cde279cf05bd13bcf0da03767ab3498079) --- source4/dsdb/repl/replicated_objects.c | 76 ++++++++-------------------------- 1 file changed, 17 insertions(+), 59 deletions(-) (limited to 'source4/dsdb/repl/replicated_objects.c') diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 9c64381e46..3a914c6774 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -39,9 +39,7 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, WERROR status; uint32_t i; struct ldb_message *msg; - struct replPropertyMetaDataBlob md; - struct ldb_val md_value; - struct drsuapi_DsReplicaObjMetaDataCtr mdc; + struct replPropertyMetaDataBlob *md; struct ldb_val guid_value; NTTIME whenChanged = 0; time_t whenChanged_t; @@ -53,7 +51,6 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, struct drsuapi_DsReplicaAttribute *name_a; struct drsuapi_DsReplicaMetaData *name_d; struct replPropertyMetaData1 *rdn_m; - struct drsuapi_DsReplicaObjMetaData *rdn_mc; int ret; if (!in->object.identifier) { @@ -98,32 +95,26 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, return WERR_FOOBAR; } - md.version = 1; - md.reserved = 0; - md.ctr.ctr1.count = in->meta_data_ctr->count; - md.ctr.ctr1.reserved = 0; - md.ctr.ctr1.array = talloc_array(mem_ctx, - struct replPropertyMetaData1, - md.ctr.ctr1.count + 1); - W_ERROR_HAVE_NO_MEMORY(md.ctr.ctr1.array); + md = talloc(mem_ctx, struct replPropertyMetaDataBlob); + W_ERROR_HAVE_NO_MEMORY(md); - mdc.count = in->meta_data_ctr->count; - mdc.reserved = 0; - mdc.array = talloc_array(mem_ctx, - struct drsuapi_DsReplicaObjMetaData, - mdc.count + 1); - W_ERROR_HAVE_NO_MEMORY(mdc.array); + md->version = 1; + md->reserved = 0; + md->ctr.ctr1.count = in->meta_data_ctr->count; + md->ctr.ctr1.reserved = 0; + md->ctr.ctr1.array = talloc_array(mem_ctx, + struct replPropertyMetaData1, + md->ctr.ctr1.count + 1); /* +1 because of the RDN attribute */ + W_ERROR_HAVE_NO_MEMORY(md->ctr.ctr1.array); for (i=0; i < in->meta_data_ctr->count; i++) { struct drsuapi_DsReplicaAttribute *a; struct drsuapi_DsReplicaMetaData *d; struct replPropertyMetaData1 *m; - struct drsuapi_DsReplicaObjMetaData *mc; a = &in->object.attribute_ctr.attributes[i]; d = &in->meta_data_ctr->meta_data[i]; - m = &md.ctr.ctr1.array[i]; - mc = &mdc.array[i]; + m = &md->ctr.ctr1.array[i]; m->attid = a->attid; m->version = d->version; @@ -132,13 +123,6 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, m->orginating_usn = d->orginating_usn; m->local_usn = 0; - mc->attribute_name = dsdb_lDAPDisplayName_by_id(schema, a->attid); - mc->version = d->version; - mc->originating_last_changed = d->orginating_time; - mc->originating_dsa_invocation_id= d->orginating_invocation_id; - mc->originating_usn = d->orginating_usn; - mc->local_usn = 0; - if (d->orginating_time > whenChanged) { whenChanged = d->orginating_time; } @@ -146,8 +130,7 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, if (a->attid == DRSUAPI_ATTRIBUTE_name) { name_a = a; name_d = d; - rdn_m = &md.ctr.ctr1.array[md.ctr.ctr1.count]; - rdn_mc = &mdc.array[mdc.count]; + rdn_m = &md->ctr.ctr1.array[md->ctr.ctr1.count]; } } @@ -184,36 +167,11 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, rdn_m->orginating_invocation_id = name_d->orginating_invocation_id; rdn_m->orginating_usn = name_d->orginating_usn; rdn_m->local_usn = 0; - md.ctr.ctr1.count++; - - rdn_mc->attribute_name = rdn_attr->lDAPDisplayName; - rdn_mc->version = name_d->version; - rdn_mc->originating_last_changed = name_d->orginating_time; - rdn_mc->originating_dsa_invocation_id = name_d->orginating_invocation_id; - rdn_mc->originating_usn = name_d->orginating_usn; - rdn_mc->local_usn = 0; - mdc.count++; - - nt_status = ndr_push_struct_blob(&md_value, msg, &md, - (ndr_push_flags_fn_t)ndr_push_replPropertyMetaDataBlob); - if (!NT_STATUS_IS_OK(nt_status)) { - return ntstatus_to_werror(nt_status); - } - ret = ldb_msg_add_value(msg, "replPropertyMetaData", &md_value, NULL); - if (ret != LDB_SUCCESS) { - return WERR_FOOBAR; - } - - if (lp_parm_bool(-1, "become dc", "dump objects", False)) { - struct ldb_ldif ldif; - fprintf(stdout, "#\n"); - ldif.changetype = LDB_CHANGETYPE_NONE; - ldif.msg = msg; - ldb_ldif_write_file(ldb, stdout, &ldif); - NDR_PRINT_DEBUG(drsuapi_DsReplicaObjMetaDataCtr, &mdc); - } + md->ctr.ctr1.count++; - out->msg = msg; + out->msg = msg; + out->guid_value = guid_value; + out->meta_data = md; return WERR_OK; } -- cgit From fbba1b39d47224feed48f904c59221008c3bf090 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 11 Jan 2007 10:21:38 +0000 Subject: r20682: make the dsdb_extended_replicated_objects_commit() interface a bit more useful, so that we can apply the schema partition objects with one call metze (This used to be commit 165ff94b8a89ef4b9145405633ed11ab9567376b) --- source4/dsdb/repl/replicated_objects.c | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) (limited to 'source4/dsdb/repl/replicated_objects.c') diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 3a914c6774..0ccb46b9c8 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -178,37 +178,23 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb, const char *partition_dn, const struct dsdb_schema *schema, - uint32_t ctr_level, - const struct drsuapi_DsGetNCChangesCtr1 *ctr1, - const struct drsuapi_DsGetNCChangesCtr6 *ctr6, + const struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr, + uint32_t object_count, + const struct drsuapi_DsReplicaObjectListItemEx *first_object, + uint32_t linked_attributes_count, + const struct drsuapi_DsReplicaLinkedAttribute *linked_attributes, + const struct drsuapi_DsReplicaHighWaterMark *new_highwatermark, + const struct drsuapi_DsReplicaCursor2CtrEx *uptodateness_vector, TALLOC_CTX *mem_ctx, struct dsdb_extended_replicated_objects **_out) { WERROR status; struct dsdb_extended_replicated_objects *out; struct ldb_result *ext_res; - const struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr; - uint32_t object_count; - struct drsuapi_DsReplicaObjectListItemEx *first_object; - struct drsuapi_DsReplicaObjectListItemEx *cur; + const struct drsuapi_DsReplicaObjectListItemEx *cur; uint32_t i; int ret; - switch (ctr_level) { - case 1: - mapping_ctr = &ctr1->mapping_ctr; - object_count = ctr1->object_count; - first_object = ctr1->first_object; - break; - case 6: - mapping_ctr = &ctr6->mapping_ctr; - object_count = ctr6->object_count; - first_object = ctr6->first_object; - break; - default: - return WERR_INVALID_PARAM; - } - status = dsdb_verify_oid_mappings(schema, mapping_ctr); W_ERROR_NOT_OK_RETURN(status); -- cgit From ffa259f4a463054a398cfcd4ae3f409c9a718bbc Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 12 Jan 2007 13:17:25 +0000 Subject: r20705: store the "replUpToDateVector" attribute in DSDB_EXTENDED_REPLICATED_OBJECTS metze (This used to be commit c9e7a58f6a16dfa28323fd0fd01ad6ee516c51b0) --- source4/dsdb/repl/replicated_objects.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source4/dsdb/repl/replicated_objects.c') diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 0ccb46b9c8..da3f6d0461 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -183,6 +183,7 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb, const struct drsuapi_DsReplicaObjectListItemEx *first_object, uint32_t linked_attributes_count, const struct drsuapi_DsReplicaLinkedAttribute *linked_attributes, + const struct GUID *source_dsa_invocation_id, const struct drsuapi_DsReplicaHighWaterMark *new_highwatermark, const struct drsuapi_DsReplicaCursor2CtrEx *uptodateness_vector, TALLOC_CTX *mem_ctx, @@ -204,6 +205,10 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb, out->partition_dn = ldb_dn_new(out, ldb, partition_dn); W_ERROR_HAVE_NO_MEMORY(out->partition_dn); + out->source_dsa_invocation_id = source_dsa_invocation_id; + out->new_highwatermark = new_highwatermark; + out->uptodateness_vector = uptodateness_vector; + out->num_objects = object_count; out->objects = talloc_array(out, struct dsdb_extended_replicated_object, -- cgit From 18f81804696c0916652acc1f9491e96fda0d25fc Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 12 Jan 2007 16:02:10 +0000 Subject: r20709: pass a repsFromTo1 struct down as it contains all needed info for the source dsa and the highwater mark vector metze (This used to be commit a31e017e5388e5abd6ed9d09adcf26d2527954a6) --- source4/dsdb/repl/replicated_objects.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'source4/dsdb/repl/replicated_objects.c') diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index da3f6d0461..1e032b4c80 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -183,8 +183,7 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb, const struct drsuapi_DsReplicaObjectListItemEx *first_object, uint32_t linked_attributes_count, const struct drsuapi_DsReplicaLinkedAttribute *linked_attributes, - const struct GUID *source_dsa_invocation_id, - const struct drsuapi_DsReplicaHighWaterMark *new_highwatermark, + const struct repsFromTo1 *source_dsa, const struct drsuapi_DsReplicaCursor2CtrEx *uptodateness_vector, TALLOC_CTX *mem_ctx, struct dsdb_extended_replicated_objects **_out) @@ -205,9 +204,8 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb, out->partition_dn = ldb_dn_new(out, ldb, partition_dn); W_ERROR_HAVE_NO_MEMORY(out->partition_dn); - out->source_dsa_invocation_id = source_dsa_invocation_id; - out->new_highwatermark = new_highwatermark; - out->uptodateness_vector = uptodateness_vector; + out->source_dsa = source_dsa; + out->uptodateness_vector= uptodateness_vector; out->num_objects = object_count; out->objects = talloc_array(out, -- cgit From 7ff19c935de67089f7a807bafb1f6e206ff6c585 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 13 Jan 2007 10:53:12 +0000 Subject: r20726: - only add the rdn attribute and it's meta_data when the 'name' attribute is there - add the values for objectGUID and whenChanged inside the ldb module, so that the ldb module has only replicated attributes as input metze (This used to be commit 0ecb07e0526462529fb21cec30e789a9002b30a1) --- source4/dsdb/repl/replicated_objects.c | 62 +++++++++++++++------------------- 1 file changed, 27 insertions(+), 35 deletions(-) (limited to 'source4/dsdb/repl/replicated_objects.c') diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 1e032b4c80..aa92269c46 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -44,13 +44,13 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, NTTIME whenChanged = 0; time_t whenChanged_t; const char *whenChanged_s; - const char *rdn_name; - const struct ldb_val *rdn_value; - const struct dsdb_attribute *rdn_attr; + const char *rdn_name = NULL; + const struct ldb_val *rdn_value = NULL; + const struct dsdb_attribute *rdn_attr = NULL; uint32_t rdn_attid; - struct drsuapi_DsReplicaAttribute *name_a; - struct drsuapi_DsReplicaMetaData *name_d; - struct replPropertyMetaData1 *rdn_m; + struct drsuapi_DsReplicaAttribute *name_a = NULL; + struct drsuapi_DsReplicaMetaData *name_d = NULL; + struct replPropertyMetaData1 *rdn_m = NULL; int ret; if (!in->object.identifier) { @@ -134,44 +134,36 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, } } - if (!name_d) { - return WERR_FOOBAR; - } + if (rdn_m) { + ret = ldb_msg_add_value(msg, rdn_attr->lDAPDisplayName, rdn_value, NULL); + if (ret != LDB_SUCCESS) { + return WERR_FOOBAR; + } - ret = ldb_msg_add_value(msg, rdn_attr->lDAPDisplayName, rdn_value, NULL); - if (ret != LDB_SUCCESS) { - return WERR_FOOBAR; - } + rdn_m->attid = rdn_attid; + rdn_m->version = name_d->version; + rdn_m->orginating_time = name_d->orginating_time; + rdn_m->orginating_invocation_id = name_d->orginating_invocation_id; + rdn_m->orginating_usn = name_d->orginating_usn; + rdn_m->local_usn = 0; + md->ctr.ctr1.count++; - nt_status = ndr_push_struct_blob(&guid_value, msg, &in->object.identifier->guid, - (ndr_push_flags_fn_t)ndr_push_GUID); - if (!NT_STATUS_IS_OK(nt_status)) { - return ntstatus_to_werror(nt_status); - } - ret = ldb_msg_add_value(msg, "objectGUID", &guid_value, NULL); - if (ret != LDB_SUCCESS) { - return WERR_FOOBAR; } whenChanged_t = nt_time_to_unix(whenChanged); whenChanged_s = ldb_timestring(msg, whenChanged_t); W_ERROR_HAVE_NO_MEMORY(whenChanged_s); - ret = ldb_msg_add_string(msg, "whenChanged", whenChanged_s); - if (ret != LDB_SUCCESS) { - return WERR_FOOBAR; + + nt_status = ndr_push_struct_blob(&guid_value, msg, &in->object.identifier->guid, + (ndr_push_flags_fn_t)ndr_push_GUID); + if (!NT_STATUS_IS_OK(nt_status)) { + return ntstatus_to_werror(nt_status); } - rdn_m->attid = rdn_attid; - rdn_m->version = name_d->version; - rdn_m->orginating_time = name_d->orginating_time; - rdn_m->orginating_invocation_id = name_d->orginating_invocation_id; - rdn_m->orginating_usn = name_d->orginating_usn; - rdn_m->local_usn = 0; - md->ctr.ctr1.count++; - - out->msg = msg; - out->guid_value = guid_value; - out->meta_data = md; + out->msg = msg; + out->guid_value = guid_value; + out->when_changed = whenChanged_s; + out->meta_data = md; return WERR_OK; } -- cgit From 21729fff115046ede3a316028b6a4e95cc7c590b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 13 Jan 2007 11:37:13 +0000 Subject: r20729: add a version number to struct dsdb_extended_replicated_objects metze (This used to be commit 2e79863d54030526841e5858e7be6a815c25593b) --- source4/dsdb/repl/replicated_objects.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/dsdb/repl/replicated_objects.c') diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index aa92269c46..274ba0894f 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -192,8 +192,9 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb, out = talloc_zero(mem_ctx, struct dsdb_extended_replicated_objects); W_ERROR_HAVE_NO_MEMORY(out); + out->version = DSDB_EXTENDED_REPLICATED_OBJECTS_VERSION; - out->partition_dn = ldb_dn_new(out, ldb, partition_dn); + out->partition_dn = ldb_dn_new(out, ldb, partition_dn); W_ERROR_HAVE_NO_MEMORY(out->partition_dn); out->source_dsa = source_dsa; -- cgit From 43063d5b14d4142ce1088a255107677462622fcb Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 13 Jan 2007 15:29:47 +0000 Subject: r20733: add a function to load the oid mappings from ldb_val's metze (This used to be commit b7f681a8a144907fa8e0a6503345da7c391dd156) --- source4/dsdb/repl/replicated_objects.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/dsdb/repl/replicated_objects.c') diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 274ba0894f..94805c1150 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -187,7 +187,7 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb, uint32_t i; int ret; - status = dsdb_verify_oid_mappings(schema, mapping_ctr); + status = dsdb_verify_oid_mappings_drsuapi(schema, mapping_ctr); W_ERROR_NOT_OK_RETURN(status); out = talloc_zero(mem_ctx, struct dsdb_extended_replicated_objects); -- cgit From abeb80b77fbd171d18ea50881022affdb1e9abbc Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 14 Jan 2007 15:35:10 +0000 Subject: r20767: don't pass a dsdb_schema to dsdb_extended_replicated_objects_commit() anymore it should use the dsdb_schema attached to the ldb_context via dsdb_get_schema() metze (This used to be commit efa31bbc3717fbf087ff76c4396975f131b16b92) --- source4/dsdb/repl/replicated_objects.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'source4/dsdb/repl/replicated_objects.c') diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 94805c1150..9a9fd40d4b 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -169,7 +169,6 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb, const char *partition_dn, - const struct dsdb_schema *schema, const struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr, uint32_t object_count, const struct drsuapi_DsReplicaObjectListItemEx *first_object, @@ -181,12 +180,18 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb, struct dsdb_extended_replicated_objects **_out) { WERROR status; + const struct dsdb_schema *schema; struct dsdb_extended_replicated_objects *out; struct ldb_result *ext_res; const struct drsuapi_DsReplicaObjectListItemEx *cur; uint32_t i; int ret; + schema = dsdb_get_schema(ldb); + if (!schema) { + return WERR_DS_SCHEMA_NOT_LOADED; + } + status = dsdb_verify_oid_mappings_drsuapi(schema, mapping_ctr); W_ERROR_NOT_OK_RETURN(status); @@ -222,8 +227,8 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb, ret = ldb_extended(ldb, DSDB_EXTENDED_REPLICATED_OBJECTS_OID, out, &ext_res); if (ret != LDB_SUCCESS) { - DEBUG(0,("Failed to apply records: %d\n", - ret)); + DEBUG(0,("Failed to apply records: %d: %s\n", + ret, ldb_strerror(ret))); talloc_free(out); return WERR_FOOBAR; } -- cgit From e38fad186f3dd0977f8601b3adf57a3008bfb9b9 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 11 Feb 2007 17:36:33 +0000 Subject: r21281: move constinancy checks to the beginning of the function metze (This used to be commit f2af44d20484e57495ab0ebd5aab993e4af43fd4) --- source4/dsdb/repl/replicated_objects.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source4/dsdb/repl/replicated_objects.c') diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 9a9fd40d4b..9f6ce4c519 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -61,6 +61,14 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, return WERR_FOOBAR; } + if (in->object.attribute_ctr.num_attributes != 0 && !in->meta_data_ctr) { + return WERR_FOOBAR; + } + + if (in->object.attribute_ctr.num_attributes != in->meta_data_ctr->count) { + return WERR_FOOBAR; + } + msg = ldb_msg_new(mem_ctx); W_ERROR_HAVE_NO_MEMORY(msg); @@ -87,14 +95,6 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, W_ERROR_NOT_OK_RETURN(status); } - if (in->object.attribute_ctr.num_attributes != 0 && !in->meta_data_ctr) { - return WERR_FOOBAR; - } - - if (in->object.attribute_ctr.num_attributes != in->meta_data_ctr->count) { - return WERR_FOOBAR; - } - md = talloc(mem_ctx, struct replPropertyMetaDataBlob); W_ERROR_HAVE_NO_MEMORY(md); -- cgit From 9bdb49455aa6ad38f71375f602e691d2b7765d04 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 11 Feb 2007 17:51:38 +0000 Subject: r21282: we only need one for loop... metze (This used to be commit 181b3a031f9683ea5e9aa2c96f121639561c6830) --- source4/dsdb/repl/replicated_objects.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'source4/dsdb/repl/replicated_objects.c') diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 9f6ce4c519..08a349d1c3 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -88,13 +88,6 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, msg->num_elements); W_ERROR_HAVE_NO_MEMORY(msg->elements); - for (i=0; i < msg->num_elements; i++) { - status = dsdb_attribute_drsuapi_to_ldb(schema, - &in->object.attribute_ctr.attributes[i], - msg->elements, &msg->elements[i]); - W_ERROR_NOT_OK_RETURN(status); - } - md = talloc(mem_ctx, struct replPropertyMetaDataBlob); W_ERROR_HAVE_NO_MEMORY(md); @@ -111,10 +104,15 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, struct drsuapi_DsReplicaAttribute *a; struct drsuapi_DsReplicaMetaData *d; struct replPropertyMetaData1 *m; + struct ldb_message_element *e; a = &in->object.attribute_ctr.attributes[i]; d = &in->meta_data_ctr->meta_data[i]; m = &md->ctr.ctr1.array[i]; + e = &msg->elements[i]; + + status = dsdb_attribute_drsuapi_to_ldb(schema, a, msg->elements, e); + W_ERROR_NOT_OK_RETURN(status); m->attid = a->attid; m->version = d->version; -- cgit From 42598ada226c2411451a2d9fdae2834e7f6a1e9f Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 12 Feb 2007 11:46:35 +0000 Subject: r21296: remove the session specific encryption from the attributes before storing them. metze (This used to be commit 7146e265a441eaa46c20361178be371eb6985371) --- source4/dsdb/repl/replicated_objects.c | 133 ++++++++++++++++++++++++++++++++- 1 file changed, 132 insertions(+), 1 deletion(-) (limited to 'source4/dsdb/repl/replicated_objects.c') diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 08a349d1c3..2184f32567 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -27,11 +27,138 @@ #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_drsuapi.h" #include "librpc/gen_ndr/ndr_drsblobs.h" +#include "lib/crypto/crypto.h" + +static WERROR dsdb_decrypt_attribute_value(TALLOC_CTX *mem_ctx, + const DATA_BLOB *gensec_skey, + DATA_BLOB *in, + DATA_BLOB *out) +{ + DATA_BLOB confounder; + DATA_BLOB enc_buffer; + + struct MD5Context md5; + uint8_t _enc_key[16]; + DATA_BLOB enc_key; + + DATA_BLOB dec_buffer; + + uint32_t crc32_given; + uint32_t crc32_calc; + DATA_BLOB checked_buffer; + + DATA_BLOB plain_buffer; + + /* + * the first 16 bytes at the beginning are the confounder + * followed by the 4 byte crc32 checksum + */ + if (in->length < 20) { + return WERR_DS_DRA_INVALID_PARAMETER; + } + confounder = data_blob_const(in->data, 16); + enc_buffer = data_blob_const(in->data + 16, in->length - 16); + + /* + * build the encryption key md5 over the session key followed + * by the confounder + * + * here the gensec session key is used and + * not the dcerpc ncacn_ip_tcp "SystemLibraryDTC" key! + */ + enc_key = data_blob_const(_enc_key, sizeof(_enc_key)); + MD5Init(&md5); + MD5Update(&md5, gensec_skey->data, gensec_skey->length); + MD5Update(&md5, confounder.data, confounder.length); + MD5Final(enc_key.data, &md5); + + /* + * copy the encrypted buffer part and + * decrypt it using the created encryption key using arcfour + */ + dec_buffer = data_blob_const(enc_buffer.data, enc_buffer.length); + arcfour_crypt_blob(dec_buffer.data, dec_buffer.length, &enc_key); + + /* + * the first 4 byte are the crc32 checksum + * of the remaining bytes + */ + crc32_given = IVAL(dec_buffer.data, 0); + crc32_calc = crc32_calc_buffer(dec_buffer.data + 4 , dec_buffer.length - 4); + if (crc32_given != crc32_calc) { + return WERR_SEC_E_DECRYPT_FAILURE; + } + checked_buffer = data_blob_const(dec_buffer.data + 4, dec_buffer.length - 4); + + if (checked_buffer.length) { + plain_buffer = data_blob_talloc(mem_ctx, checked_buffer.data, checked_buffer.length); + memset(checked_buffer.data, 0x00, checked_buffer.length); + W_ERROR_HAVE_NO_MEMORY(plain_buffer.data); + } else { + plain_buffer = data_blob_const(NULL, 0); + } + + *out = plain_buffer; + return WERR_OK; +} + +static WERROR dsdb_decrypt_attribute(const DATA_BLOB *gensec_skey, + struct drsuapi_DsReplicaAttribute *attr) +{ + WERROR status; + TALLOC_CTX *mem_ctx; + DATA_BLOB *enc_data; + DATA_BLOB plain_data; + + if (attr->value_ctr.num_values == 0) { + return WERR_OK; + } + + switch (attr->attid) { + case DRSUAPI_ATTRIBUTE_dBCSPwd: + case DRSUAPI_ATTRIBUTE_unicodePwd: + case DRSUAPI_ATTRIBUTE_ntPwdHistory: + case DRSUAPI_ATTRIBUTE_lmPwdHistory: + case DRSUAPI_ATTRIBUTE_supplementalCredentials: + case DRSUAPI_ATTRIBUTE_priorValue: + case DRSUAPI_ATTRIBUTE_currentValue: + case DRSUAPI_ATTRIBUTE_trustAuthOutgoing: + case DRSUAPI_ATTRIBUTE_trustAuthIncoming: + case DRSUAPI_ATTRIBUTE_initialAuthOutgoing: + case DRSUAPI_ATTRIBUTE_initialAuthIncoming: + break; + default: + return WERR_OK; + } + + if (attr->value_ctr.num_values > 1) { + return WERR_DS_DRA_INVALID_PARAMETER; + } + + if (!attr->value_ctr.values[0].blob) { + return WERR_DS_DRA_INVALID_PARAMETER; + } + + mem_ctx = attr->value_ctr.values[0].blob; + enc_data = attr->value_ctr.values[0].blob; + + status = dsdb_decrypt_attribute_value(mem_ctx, + gensec_skey, + enc_data, + &plain_data); + W_ERROR_NOT_OK_RETURN(status); + + talloc_free(attr->value_ctr.values[0].blob->data); + *attr->value_ctr.values[0].blob = plain_data; + + return WERR_OK; +} static WERROR dsdb_convert_object(struct ldb_context *ldb, const struct dsdb_schema *schema, struct dsdb_extended_replicated_objects *ctr, const struct drsuapi_DsReplicaObjectListItemEx *in, + const DATA_BLOB *gensec_skey, TALLOC_CTX *mem_ctx, struct dsdb_extended_replicated_object *out) { @@ -111,6 +238,9 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, m = &md->ctr.ctr1.array[i]; e = &msg->elements[i]; + status = dsdb_decrypt_attribute(gensec_skey, a); + W_ERROR_NOT_OK_RETURN(status); + status = dsdb_attribute_drsuapi_to_ldb(schema, a, msg->elements, e); W_ERROR_NOT_OK_RETURN(status); @@ -174,6 +304,7 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb, const struct drsuapi_DsReplicaLinkedAttribute *linked_attributes, const struct repsFromTo1 *source_dsa, const struct drsuapi_DsReplicaCursor2CtrEx *uptodateness_vector, + const DATA_BLOB *gensec_skey, TALLOC_CTX *mem_ctx, struct dsdb_extended_replicated_objects **_out) { @@ -214,7 +345,7 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb, return WERR_FOOBAR; } - status = dsdb_convert_object(ldb, schema, out, cur, out->objects, &out->objects[i]); + status = dsdb_convert_object(ldb, schema, out, cur, gensec_skey, out->objects, &out->objects[i]); W_ERROR_NOT_OK_RETURN(status); } if (i != out->num_objects) { -- cgit From e4d2c67467714ec02102f592681737c20e54f93a Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 15 Feb 2007 12:40:13 +0000 Subject: r21359: remove the rid encryption before storing the password hashes We decided to store them plain in our ldb metze (This used to be commit ff13b21102641a308bd48a8efa6b94a98f567e15) --- source4/dsdb/repl/replicated_objects.c | 46 ++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 7 deletions(-) (limited to 'source4/dsdb/repl/replicated_objects.c') diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 2184f32567..b8456a0556 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -28,9 +28,12 @@ #include "librpc/gen_ndr/ndr_drsuapi.h" #include "librpc/gen_ndr/ndr_drsblobs.h" #include "lib/crypto/crypto.h" +#include "libcli/auth/libcli_auth.h" static WERROR dsdb_decrypt_attribute_value(TALLOC_CTX *mem_ctx, const DATA_BLOB *gensec_skey, + bool rid_crypt, + uint32_t rid, DATA_BLOB *in, DATA_BLOB *out) { @@ -49,6 +52,13 @@ static WERROR dsdb_decrypt_attribute_value(TALLOC_CTX *mem_ctx, DATA_BLOB plain_buffer; + /* + * users with rid == 0 should not exist + */ + if (rid_crypt && rid == 0) { + return WERR_DS_DRA_INVALID_PARAMETER; + } + /* * the first 16 bytes at the beginning are the confounder * followed by the 4 byte crc32 checksum @@ -90,12 +100,21 @@ static WERROR dsdb_decrypt_attribute_value(TALLOC_CTX *mem_ctx, } checked_buffer = data_blob_const(dec_buffer.data + 4, dec_buffer.length - 4); - if (checked_buffer.length) { - plain_buffer = data_blob_talloc(mem_ctx, checked_buffer.data, checked_buffer.length); - memset(checked_buffer.data, 0x00, checked_buffer.length); - W_ERROR_HAVE_NO_MEMORY(plain_buffer.data); - } else { - plain_buffer = data_blob_const(NULL, 0); + plain_buffer = data_blob_talloc(mem_ctx, checked_buffer.data, checked_buffer.length); + W_ERROR_HAVE_NO_MEMORY(plain_buffer.data); + + if (rid_crypt) { + uint32_t i, num_hashes; + + if ((checked_buffer.length % 16) != 0) { + return WERR_DS_DRA_INVALID_PARAMETER; + } + + num_hashes = plain_buffer.length / 16; + for (i = 0; i < num_hashes; i++) { + uint32_t offset = i * 16; + sam_rid_crypt(rid, checked_buffer.data + offset, plain_buffer.data + offset, 0); + } } *out = plain_buffer; @@ -103,12 +122,14 @@ static WERROR dsdb_decrypt_attribute_value(TALLOC_CTX *mem_ctx, } static WERROR dsdb_decrypt_attribute(const DATA_BLOB *gensec_skey, + uint32_t rid, struct drsuapi_DsReplicaAttribute *attr) { WERROR status; TALLOC_CTX *mem_ctx; DATA_BLOB *enc_data; DATA_BLOB plain_data; + bool rid_crypt = false; if (attr->value_ctr.num_values == 0) { return WERR_OK; @@ -119,6 +140,8 @@ static WERROR dsdb_decrypt_attribute(const DATA_BLOB *gensec_skey, case DRSUAPI_ATTRIBUTE_unicodePwd: case DRSUAPI_ATTRIBUTE_ntPwdHistory: case DRSUAPI_ATTRIBUTE_lmPwdHistory: + rid_crypt = true; + break; case DRSUAPI_ATTRIBUTE_supplementalCredentials: case DRSUAPI_ATTRIBUTE_priorValue: case DRSUAPI_ATTRIBUTE_currentValue: @@ -144,6 +167,8 @@ static WERROR dsdb_decrypt_attribute(const DATA_BLOB *gensec_skey, status = dsdb_decrypt_attribute_value(mem_ctx, gensec_skey, + rid_crypt, + rid, enc_data, &plain_data); W_ERROR_NOT_OK_RETURN(status); @@ -178,6 +203,8 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, struct drsuapi_DsReplicaAttribute *name_a = NULL; struct drsuapi_DsReplicaMetaData *name_d = NULL; struct replPropertyMetaData1 *rdn_m = NULL; + struct dom_sid *sid = NULL; + uint32_t rid = 0; int ret; if (!in->object.identifier) { @@ -196,6 +223,11 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, return WERR_FOOBAR; } + sid = &in->object.identifier->sid; + if (sid->num_auths > 0) { + rid = sid->sub_auths[sid->num_auths - 1]; + } + msg = ldb_msg_new(mem_ctx); W_ERROR_HAVE_NO_MEMORY(msg); @@ -238,7 +270,7 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, m = &md->ctr.ctr1.array[i]; e = &msg->elements[i]; - status = dsdb_decrypt_attribute(gensec_skey, a); + status = dsdb_decrypt_attribute(gensec_skey, rid, a); W_ERROR_NOT_OK_RETURN(status); status = dsdb_attribute_drsuapi_to_ldb(schema, a, msg->elements, e); -- cgit From 3e697d5110653d22bebade0da8f0c6c3749a2d09 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 9 Mar 2007 10:09:37 +0000 Subject: r21773: fix typo orginating -> originating and use the struct member names in all cases metze (This used to be commit c543ee57454d006c545e3e9e20c9ac0114081d3d) --- source4/dsdb/repl/replicated_objects.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source4/dsdb/repl/replicated_objects.c') diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index b8456a0556..5f253ea2f4 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -278,13 +278,13 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, m->attid = a->attid; m->version = d->version; - m->orginating_time = d->orginating_time; - m->orginating_invocation_id = d->orginating_invocation_id; - m->orginating_usn = d->orginating_usn; + m->originating_change_time = d->originating_change_time; + m->originating_invocation_id = d->originating_invocation_id; + m->originating_usn = d->originating_usn; m->local_usn = 0; - if (d->orginating_time > whenChanged) { - whenChanged = d->orginating_time; + if (d->originating_change_time > whenChanged) { + whenChanged = d->originating_change_time; } if (a->attid == DRSUAPI_ATTRIBUTE_name) { @@ -302,9 +302,9 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, rdn_m->attid = rdn_attid; rdn_m->version = name_d->version; - rdn_m->orginating_time = name_d->orginating_time; - rdn_m->orginating_invocation_id = name_d->orginating_invocation_id; - rdn_m->orginating_usn = name_d->orginating_usn; + rdn_m->originating_change_time = name_d->originating_change_time; + rdn_m->originating_invocation_id = name_d->originating_invocation_id; + rdn_m->originating_usn = name_d->originating_usn; rdn_m->local_usn = 0; md->ctr.ctr1.count++; -- cgit From 41c545350748f79fd543e2ac914f63139cf0b9e7 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 14 Mar 2007 19:10:21 +0000 Subject: r21839: add my email address metze (This used to be commit e3be33c1d9f9e44ef37e6ef72a23576474f6e725) --- source4/dsdb/repl/replicated_objects.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/dsdb/repl/replicated_objects.c') diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 5f253ea2f4..71bc4f61f4 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -2,7 +2,7 @@ Unix SMB/CIFS mplementation. Helper functions for applying replicated objects - Copyright (C) Stefan Metzmacher 2007 + Copyright (C) Stefan Metzmacher 2007 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -- cgit From f19637f957590881b54bfa92c4307cd8e3494cc7 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 16 Mar 2007 16:35:44 +0000 Subject: r21859: add a comment why we remove the rid_crypt obfuscation metze (This used to be commit e44b6df1387096989726c0a68189fe6c4e37dfd7) --- source4/dsdb/repl/replicated_objects.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source4/dsdb/repl/replicated_objects.c') diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 71bc4f61f4..259035fed7 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -103,6 +103,14 @@ static WERROR dsdb_decrypt_attribute_value(TALLOC_CTX *mem_ctx, plain_buffer = data_blob_talloc(mem_ctx, checked_buffer.data, checked_buffer.length); W_ERROR_HAVE_NO_MEMORY(plain_buffer.data); + /* + * The following rid_crypt obfuscation isn't session specific + * and not really needed here, because we allways know the rid of the + * user account. + * + * But for the rest of samba it's easier when we remove this static + * obfuscation here + */ if (rid_crypt) { uint32_t i, num_hashes; -- cgit From 0479a2f1cbae51fcd8dbdc3c148c808421fb4d25 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jul 2007 02:07:03 +0000 Subject: r23792: convert Samba4 to GPLv3 There are still a few tidyups of old FSF addresses to come (in both s3 and s4). More commits soon. (This used to be commit fcf38a38ac691abd0fa51b89dc951a08e89fdafa) --- source4/dsdb/repl/replicated_objects.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source4/dsdb/repl/replicated_objects.c') diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 259035fed7..6f34ac8556 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -6,7 +6,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -15,8 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see . */ -- cgit From 529763a9aa192a6785ba878aceeb1683c2510913 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 9 Nov 2007 19:24:51 +0100 Subject: r25920: ndr: change NTSTAUS into enum ndr_err_code (samba4 callers) lib/messaging/ lib/registry/ lib/ldb-samba/ librpc/rpc/ auth/auth_winbind.c auth/gensec/ auth/kerberos/ dsdb/repl/ dsdb/samdb/ dsdb/schema/ torture/ cluster/ctdb/ kdc/ ntvfs/ipc/ torture/rap/ ntvfs/ utils/getntacl.c ntptr/ smb_server/ libcli/wrepl/ wrepl_server/ libcli/cldap/ libcli/dgram/ libcli/ldap/ libcli/raw/ libcli/nbt/ libnet/ winbind/ rpc_server/ metze (This used to be commit 6223c7fddc972687eb577e04fc1c8e0604c35435) --- source4/dsdb/repl/replicated_objects.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source4/dsdb/repl/replicated_objects.c') diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 6f34ac8556..c47108559d 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -195,6 +195,7 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, struct dsdb_extended_replicated_object *out) { NTSTATUS nt_status; + enum ndr_err_code ndr_err; WERROR status; uint32_t i; struct ldb_message *msg; @@ -321,9 +322,10 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, whenChanged_s = ldb_timestring(msg, whenChanged_t); W_ERROR_HAVE_NO_MEMORY(whenChanged_s); - nt_status = ndr_push_struct_blob(&guid_value, msg, &in->object.identifier->guid, + ndr_err = ndr_push_struct_blob(&guid_value, msg, &in->object.identifier->guid, (ndr_push_flags_fn_t)ndr_push_GUID); - if (!NT_STATUS_IS_OK(nt_status)) { + if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { + nt_status = ndr_map_error2ntstatus(ndr_err); return ntstatus_to_werror(nt_status); } -- cgit From 86dc05e99f124db47f2743d1fc23117a7f5145ab Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 1 Jan 2008 22:05:05 -0600 Subject: r26638: libndr: Require explicitly specifying iconv_convenience for ndr_struct_push_blob(). (This used to be commit 61ad78ac98937ef7a9aa32075a91a1c95b7606b3) --- source4/dsdb/repl/replicated_objects.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source4/dsdb/repl/replicated_objects.c') diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index c47108559d..8aff1340a5 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -28,6 +28,7 @@ #include "librpc/gen_ndr/ndr_drsblobs.h" #include "lib/crypto/crypto.h" #include "libcli/auth/libcli_auth.h" +#include "param/param.h" static WERROR dsdb_decrypt_attribute_value(TALLOC_CTX *mem_ctx, const DATA_BLOB *gensec_skey, @@ -322,7 +323,9 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb, whenChanged_s = ldb_timestring(msg, whenChanged_t); W_ERROR_HAVE_NO_MEMORY(whenChanged_s); - ndr_err = ndr_push_struct_blob(&guid_value, msg, &in->object.identifier->guid, + ndr_err = ndr_push_struct_blob(&guid_value, msg, + lp_iconv_convenience(ldb_get_opaque(ldb, "loadparm")), + &in->object.identifier->guid, (ndr_push_flags_fn_t)ndr_push_GUID); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { nt_status = ndr_map_error2ntstatus(ndr_err); -- cgit From dc08079d814cd1375a3d93530bc2fa0e336210d8 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 23 Jan 2008 15:44:02 +1100 Subject: Get more information from ldb when reporting a failed replication. Andrew Bartlett (This used to be commit 948ee9b7acd90b994bb9d9f7c1813a8eca430e4f) --- source4/dsdb/repl/replicated_objects.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/dsdb/repl/replicated_objects.c') diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 8aff1340a5..552d83f411 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -400,8 +400,8 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb, ret = ldb_extended(ldb, DSDB_EXTENDED_REPLICATED_OBJECTS_OID, out, &ext_res); if (ret != LDB_SUCCESS) { - DEBUG(0,("Failed to apply records: %d: %s\n", - ret, ldb_strerror(ret))); + DEBUG(0,("Failed to apply records: %s: %s\n", + ldb_errstring(ldb), ldb_strerror(ret))); talloc_free(out); return WERR_FOOBAR; } -- cgit