libnet-vampire: reports Exops as they rather than sync on some partitions

Instead of showing:
Partition[CN=RODC,OU=Domain Controllers,DC=samba,DC=example,DC=com]
objects[1] linked_values[8]
Report a exop based on CN=RODC,OU=Domain Controllers,DC=samba,DC=example,DC=com
as
Exop on CN=RODC,OU=Domain Controllers,DC=samba,DC=example,DC=com, ...

Signed-off-by: Matthieu Patou <mat@matws.net>
Reviewed-By: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Matthieu Patou <mat@samba.org>
Autobuild-Date(master): Wed Jan  9 09:01:30 CET 2013 on sn-devel-104

diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c
index a354d41e3895df9d5446a2db1f7cc490bdede78e..599119f81411d76d067b082bb0c120884e2a74be 100644 (file)
--- a/source4/libnet/libnet_vampire.c
+++ b/source4/libnet/libnet_vampire.c
@@ -643,6 +643,7 @@ NTSTATUS libnet_vampire_cb_store_chunk(void *private_data,
        char *tmp_dns_name;
        uint32_t i;
        uint64_t seq_num;
+       bool is_exop = false;
 
        s_dsa                   = talloc_zero(s, struct repsFromTo1);
        NT_STATUS_HAVE_NO_MEMORY(s_dsa);
@@ -686,12 +687,21 @@ NTSTATUS libnet_vampire_cb_store_chunk(void *private_data,
                req_replica_flags = 0;
                break;
        case 5:
+               if (c->req5->extended_op != DRSUAPI_EXOP_NONE) {
+                       is_exop = true;
+               }
                req_replica_flags = c->req5->replica_flags;
                break;
        case 8:
+               if (c->req8->extended_op != DRSUAPI_EXOP_NONE) {
+                       is_exop = true;
+               }
                req_replica_flags = c->req8->replica_flags;
                break;
        case 10:
+               if (c->req10->extended_op != DRSUAPI_EXOP_NONE) {
+                       is_exop = true;
+               }
                req_replica_flags = c->req10->replica_flags;
                break;
        default:
@@ -728,13 +738,24 @@ NTSTATUS libnet_vampire_cb_store_chunk(void *private_data,
        }
        s->total_objects += object_count;
 
-       if (nc_object_count) {
-               DEBUG(0,("Partition[%s] objects[%u/%u] linked_values[%u/%u]\n",
-                       c->partition->nc.dn, s->total_objects, nc_object_count,
-                       linked_attributes_count, nc_linked_attributes_count));
+       if (is_exop) {
+               if (nc_object_count) {
+                       DEBUG(0,("Exop on[%s] objects[%u/%u] linked_values[%u/%u]\n",
+                               c->partition->nc.dn, s->total_objects, nc_object_count,
+                               linked_attributes_count, nc_linked_attributes_count));
+               } else {
+                       DEBUG(0,("Exop on[%s] objects[%u] linked_values[%u]\n",
+                       c->partition->nc.dn, s->total_objects, linked_attributes_count));
+               }
        } else {
-               DEBUG(0,("Partition[%s] objects[%u] linked_values[%u]\n",
-               c->partition->nc.dn, s->total_objects, linked_attributes_count));
+               if (nc_object_count) {
+                       DEBUG(0,("Partition[%s] objects[%u/%u] linked_values[%u/%u]\n",
+                               c->partition->nc.dn, s->total_objects, nc_object_count,
+                               linked_attributes_count, nc_linked_attributes_count));
+               } else {
+                       DEBUG(0,("Partition[%s] objects[%u] linked_values[%u]\n",
+                       c->partition->nc.dn, s->total_objects, linked_attributes_count));
+               }
        }