s4-drs: Refactored drepl_service and send_ridalloc_request so that the structures...

[samba.git] / source4 / dsdb / repl / drepl_service.h

diff --git a/source4/dsdb/repl/drepl_service.h b/source4/dsdb/repl/drepl_service.h
index 4019bf730700778071115d78e573c7029a3ef59f..dba9a37baebca7becfdf7e2e2879824649c4d00b 100644 (file)
--- a/source4/dsdb/repl/drepl_service.h
+++ b/source4/dsdb/repl/drepl_service.h
@@ -105,7 +105,8 @@ struct dreplsrv_partition {
 
 typedef void (*dreplsrv_fsmo_callback_t)(struct dreplsrv_service *,
                                         WERROR,
-                                        enum drsuapi_DsExtendedError);
+                                        enum drsuapi_DsExtendedError,
+                                        void *cb_data);
 
 struct dreplsrv_out_operation {
        struct dreplsrv_out_operation *prev, *next;
@@ -116,8 +117,9 @@ struct dreplsrv_out_operation {
 
        enum drsuapi_DsExtendedOperation extended_op;
        uint64_t fsmo_info;
-       dreplsrv_fsmo_callback_t callback;
        enum drsuapi_DsExtendedError extended_ret;
+       dreplsrv_fsmo_callback_t callback;
+       void *cb_data;
 };
 
 struct dreplsrv_notify_operation {
@@ -216,8 +218,8 @@ struct dreplsrv_service {
 
        struct {
                bool in_progress;
-               struct dreplsrv_partition_source_dsa *rid_manager_source_dsa;
-       } ridalloc;
+               struct dreplsrv_partition_source_dsa *role_owner_source_dsa;
+       } ncchanges_extended;
 
        bool syncall_workaround;
 };