summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source4/libnet/libnet_vampire.c23
-rw-r--r--source4/torture/libnet/libnet_BecomeDC.c23
2 files changed, 20 insertions, 26 deletions
diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index 56a8ebe034..c9975c8a29 100644
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -136,7 +136,6 @@ static NTSTATUS vampire_apply_schema(struct vampire_state *s,
{
WERROR status;
const struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr;
- uint32_t total_object_count;
uint32_t object_count;
struct drsuapi_DsReplicaObjectListItemEx *first_object;
struct drsuapi_DsReplicaObjectListItemEx *cur;
@@ -164,7 +163,6 @@ static NTSTATUS vampire_apply_schema(struct vampire_state *s,
switch (c->ctr_level) {
case 1:
mapping_ctr = &c->ctr1->mapping_ctr;
- total_object_count = c->ctr1->total_object_count;
object_count = s->schema_part.object_count;
first_object = s->schema_part.first_object;
linked_attributes_count = 0;
@@ -176,7 +174,6 @@ static NTSTATUS vampire_apply_schema(struct vampire_state *s,
break;
case 6:
mapping_ctr = &c->ctr6->mapping_ctr;
- total_object_count = c->ctr6->total_object_count;
object_count = s->schema_part.object_count;
first_object = s->schema_part.first_object;
linked_attributes_count = 0; /* TODO: ! */
@@ -370,7 +367,7 @@ static NTSTATUS vampire_schema_chunk(void *private_data,
struct vampire_state *s = talloc_get_type(private_data, struct vampire_state);
WERROR status;
const struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr;
- uint32_t total_object_count;
+ uint32_t nc_object_count;
uint32_t object_count;
struct drsuapi_DsReplicaObjectListItemEx *first_object;
struct drsuapi_DsReplicaObjectListItemEx *cur;
@@ -378,13 +375,13 @@ static NTSTATUS vampire_schema_chunk(void *private_data,
switch (c->ctr_level) {
case 1:
mapping_ctr = &c->ctr1->mapping_ctr;
- total_object_count = c->ctr1->total_object_count;
+ nc_object_count = c->ctr1->extended_ret; /* maybe w2k send this unexpected? */
object_count = c->ctr1->object_count;
first_object = c->ctr1->first_object;
break;
case 6:
mapping_ctr = &c->ctr6->mapping_ctr;
- total_object_count = c->ctr6->total_object_count;
+ nc_object_count = c->ctr6->nc_object_count;
object_count = c->ctr6->object_count;
first_object = c->ctr6->first_object;
break;
@@ -392,9 +389,9 @@ static NTSTATUS vampire_schema_chunk(void *private_data,
return NT_STATUS_INVALID_PARAMETER;
}
- if (total_object_count) {
+ if (nc_object_count) {
DEBUG(0,("Schema-DN[%s] objects[%u/%u]\n",
- c->partition->nc.dn, object_count, total_object_count));
+ c->partition->nc.dn, object_count, nc_object_count));
} else {
DEBUG(0,("Schema-DN[%s] objects[%u]\n",
c->partition->nc.dn, object_count));
@@ -442,7 +439,7 @@ static NTSTATUS vampire_store_chunk(void *private_data,
struct vampire_state *s = talloc_get_type(private_data, struct vampire_state);
WERROR status;
const struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr;
- uint32_t total_object_count;
+ uint32_t nc_object_count;
uint32_t object_count;
struct drsuapi_DsReplicaObjectListItemEx *first_object;
uint32_t linked_attributes_count;
@@ -461,7 +458,7 @@ static NTSTATUS vampire_store_chunk(void *private_data,
switch (c->ctr_level) {
case 1:
mapping_ctr = &c->ctr1->mapping_ctr;
- total_object_count = c->ctr1->total_object_count;
+ nc_object_count = c->ctr1->extended_ret; /* maybe w2k send this unexpected? */
object_count = c->ctr1->object_count;
first_object = c->ctr1->first_object;
linked_attributes_count = 0;
@@ -473,7 +470,7 @@ static NTSTATUS vampire_store_chunk(void *private_data,
break;
case 6:
mapping_ctr = &c->ctr6->mapping_ctr;
- total_object_count = c->ctr6->total_object_count;
+ nc_object_count = c->ctr6->nc_object_count;
object_count = c->ctr6->object_count;
first_object = c->ctr6->first_object;
linked_attributes_count = c->ctr6->linked_attributes_count;
@@ -498,9 +495,9 @@ static NTSTATUS vampire_store_chunk(void *private_data,
NT_STATUS_HAVE_NO_MEMORY(tmp_dns_name);
s_dsa->other_info->dns_name = tmp_dns_name;
- if (total_object_count) {
+ if (nc_object_count) {
DEBUG(0,("Partition[%s] objects[%u/%u]\n",
- c->partition->nc.dn, object_count, total_object_count));
+ c->partition->nc.dn, object_count, nc_object_count));
} else {
DEBUG(0,("Partition[%s] objects[%u]\n",
c->partition->nc.dn, object_count));
diff --git a/source4/torture/libnet/libnet_BecomeDC.c b/source4/torture/libnet/libnet_BecomeDC.c
index f34769de6c..2631746e95 100644
--- a/source4/torture/libnet/libnet_BecomeDC.c
+++ b/source4/torture/libnet/libnet_BecomeDC.c
@@ -123,7 +123,6 @@ static NTSTATUS test_apply_schema(struct test_become_dc_state *s,
{
WERROR status;
const struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr;
- uint32_t total_object_count;
uint32_t object_count;
struct drsuapi_DsReplicaObjectListItemEx *first_object;
struct drsuapi_DsReplicaObjectListItemEx *cur;
@@ -152,7 +151,6 @@ static NTSTATUS test_apply_schema(struct test_become_dc_state *s,
switch (c->ctr_level) {
case 1:
mapping_ctr = &c->ctr1->mapping_ctr;
- total_object_count = c->ctr1->total_object_count;
object_count = s->schema_part.object_count;
first_object = s->schema_part.first_object;
linked_attributes_count = 0;
@@ -164,7 +162,6 @@ static NTSTATUS test_apply_schema(struct test_become_dc_state *s,
break;
case 6:
mapping_ctr = &c->ctr6->mapping_ctr;
- total_object_count = c->ctr6->total_object_count;
object_count = s->schema_part.object_count;
first_object = s->schema_part.first_object;
linked_attributes_count = 0; /* TODO: ! */
@@ -360,7 +357,7 @@ static NTSTATUS test_become_dc_schema_chunk(void *private_data,
struct test_become_dc_state *s = talloc_get_type(private_data, struct test_become_dc_state);
WERROR status;
const struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr;
- uint32_t total_object_count;
+ uint32_t nc_object_count;
uint32_t object_count;
struct drsuapi_DsReplicaObjectListItemEx *first_object;
struct drsuapi_DsReplicaObjectListItemEx *cur;
@@ -368,13 +365,13 @@ static NTSTATUS test_become_dc_schema_chunk(void *private_data,
switch (c->ctr_level) {
case 1:
mapping_ctr = &c->ctr1->mapping_ctr;
- total_object_count = c->ctr1->total_object_count;
+ nc_object_count = c->ctr1->extended_ret; /* maybe w2k send this unexpected? */
object_count = c->ctr1->object_count;
first_object = c->ctr1->first_object;
break;
case 6:
mapping_ctr = &c->ctr6->mapping_ctr;
- total_object_count = c->ctr6->total_object_count;
+ nc_object_count = c->ctr6->nc_object_count;
object_count = c->ctr6->object_count;
first_object = c->ctr6->first_object;
break;
@@ -382,9 +379,9 @@ static NTSTATUS test_become_dc_schema_chunk(void *private_data,
return NT_STATUS_INVALID_PARAMETER;
}
- if (total_object_count) {
+ if (nc_object_count) {
DEBUG(0,("Schema-DN[%s] objects[%u/%u]\n",
- c->partition->nc.dn, object_count, total_object_count));
+ c->partition->nc.dn, object_count, nc_object_count));
} else {
DEBUG(0,("Schema-DN[%s] objects[%u]\n",
c->partition->nc.dn, object_count));
@@ -432,7 +429,7 @@ static NTSTATUS test_become_dc_store_chunk(void *private_data,
struct test_become_dc_state *s = talloc_get_type(private_data, struct test_become_dc_state);
WERROR status;
const struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr;
- uint32_t total_object_count;
+ uint32_t nc_object_count;
uint32_t object_count;
struct drsuapi_DsReplicaObjectListItemEx *first_object;
uint32_t linked_attributes_count;
@@ -451,7 +448,7 @@ static NTSTATUS test_become_dc_store_chunk(void *private_data,
switch (c->ctr_level) {
case 1:
mapping_ctr = &c->ctr1->mapping_ctr;
- total_object_count = c->ctr1->total_object_count;
+ nc_object_count = c->ctr1->extended_ret; /* maybe w2k send this unexpected? */
object_count = c->ctr1->object_count;
first_object = c->ctr1->first_object;
linked_attributes_count = 0;
@@ -463,7 +460,7 @@ static NTSTATUS test_become_dc_store_chunk(void *private_data,
break;
case 6:
mapping_ctr = &c->ctr6->mapping_ctr;
- total_object_count = c->ctr6->total_object_count;
+ nc_object_count = c->ctr6->nc_object_count;
object_count = c->ctr6->object_count;
first_object = c->ctr6->first_object;
linked_attributes_count = c->ctr6->linked_attributes_count;
@@ -488,9 +485,9 @@ static NTSTATUS test_become_dc_store_chunk(void *private_data,
NT_STATUS_HAVE_NO_MEMORY(tmp_dns_name);
s_dsa->other_info->dns_name = tmp_dns_name;
- if (total_object_count) {
+ if (nc_object_count) {
DEBUG(0,("Partition[%s] objects[%u/%u]\n",
- c->partition->nc.dn, object_count, total_object_count));
+ c->partition->nc.dn, object_count, nc_object_count));
} else {
DEBUG(0,("Partition[%s] objects[%u]\n",
c->partition->nc.dn, object_count));
generated by cgit (git 2.34.1) at 2024-12-16 15:09:52 +0000