s4-repl: split out the extended op handling

[metze/samba/wip.git] / source4 / dsdb / repl / drepl_ridalloc.c

diff --git a/source4/dsdb/repl/drepl_ridalloc.c b/source4/dsdb/repl/drepl_ridalloc.c
index 44843166f76d723c31bf875ee1c1ed7ac972bb95..ff5bb163e72d1671d2d4230017a1a80397d366af 100644 (file)
--- a/source4/dsdb/repl/drepl_ridalloc.c
+++ b/source4/dsdb/repl/drepl_ridalloc.c
@@ -30,108 +30,6 @@
 #include "dsdb/repl/drepl_service.h"
 #include "param/param.h"
 
-
-/*
-  create the role owner source dsa structure
- */
-
-WERROR drepl_create_role_owner_source_dsa(struct dreplsrv_service *service,
-                                         struct ldb_dn *fsmo_role_dn,
-                                         struct ldb_dn *role_owner_dn)
-{
-       struct dreplsrv_partition_source_dsa *sdsa;
-       struct ldb_context *ldb = service->samdb;
-       int ret;
-       WERROR werr;
-
-       sdsa = talloc_zero(service, struct dreplsrv_partition_source_dsa);
-       W_ERROR_HAVE_NO_MEMORY(sdsa);
-
-       sdsa->partition = talloc_zero(sdsa, struct dreplsrv_partition);
-       if (!sdsa->partition) {
-               talloc_free(sdsa);
-               return WERR_NOMEM;
-       }
-
-       sdsa->partition->dn = ldb_dn_copy(sdsa->partition, fsmo_role_dn);
-       if (!sdsa->partition->dn) {
-               talloc_free(sdsa);
-               return WERR_NOMEM;
-       }
-       sdsa->partition->nc.dn = ldb_dn_alloc_linearized(sdsa->partition, fsmo_role_dn);
-       if (!sdsa->partition->nc.dn) {
-               talloc_free(sdsa);
-               return WERR_NOMEM;
-       }
-       ret = dsdb_find_guid_by_dn(ldb, fsmo_role_dn, &sdsa->partition->nc.guid);
-       if (ret != LDB_SUCCESS) {
-               DEBUG(0,(__location__ ": Failed to find GUID for %s\n",
-                        ldb_dn_get_linearized(fsmo_role_dn)));
-               talloc_free(sdsa);
-               return WERR_DS_DRA_INTERNAL_ERROR;
-       }
-
-       sdsa->repsFrom1 = &sdsa->_repsFromBlob.ctr.ctr1;
-       ret = dsdb_find_guid_by_dn(ldb, role_owner_dn, &sdsa->repsFrom1->source_dsa_obj_guid);
-       if (ret != LDB_SUCCESS) {
-               DEBUG(0,(__location__ ": Failed to find objectGUID for %s\n",
-                        ldb_dn_get_linearized(role_owner_dn)));
-               talloc_free(sdsa);
-               return WERR_DS_DRA_INTERNAL_ERROR;
-       }
-
-       sdsa->repsFrom1->other_info = talloc_zero(sdsa, struct repsFromTo1OtherInfo);
-       if (!sdsa->repsFrom1->other_info) {
-               talloc_free(sdsa);
-               return WERR_NOMEM;
-       }
-
-       sdsa->repsFrom1->other_info->dns_name =
-               talloc_asprintf(sdsa->repsFrom1->other_info, "%s._msdcs.%s",
-                               GUID_string(sdsa->repsFrom1->other_info, &sdsa->repsFrom1->source_dsa_obj_guid),
-                               lpcfg_dnsdomain(service->task->lp_ctx));
-       if (!sdsa->repsFrom1->other_info->dns_name) {
-               talloc_free(sdsa);
-               return WERR_NOMEM;
-       }
-
-
-       werr = dreplsrv_out_connection_attach(service, sdsa->repsFrom1, &sdsa->conn);
-       if (!W_ERROR_IS_OK(werr)) {
-               DEBUG(0,(__location__ ": Failed to attach connection to %s\n",
-                        ldb_dn_get_linearized(fsmo_role_dn)));
-               talloc_free(sdsa);
-               return werr;
-       }
-
-       service->ncchanges_extended.role_owner_source_dsa = sdsa;
-       return WERR_OK;
-}
-
-/*
-  schedule a getncchanges request to the role owner for an extended operation
- */
-WERROR drepl_request_extended_op(struct dreplsrv_service *service,
-                                struct ldb_dn *fsmo_role_dn,
-                                struct ldb_dn *role_owner_dn,
-                                enum drsuapi_DsExtendedOperation extended_op,
-                                uint64_t alloc_pool,
-                                dreplsrv_fsmo_callback_t callback)
-{
-       WERROR werr;
-       if (service->ncchanges_extended.role_owner_source_dsa == NULL) {
-               /* we need to establish a connection to the role owner */
-               werr = drepl_create_role_owner_source_dsa(service, fsmo_role_dn, role_owner_dn);
-               W_ERROR_NOT_OK_RETURN(werr);
-       }
-
-       service->ncchanges_extended.in_progress = true;
-       werr = dreplsrv_schedule_partition_pull_source(service, service->ncchanges_extended.role_owner_source_dsa,
-                                                      extended_op, alloc_pool,
-                                                      callback, NULL);
-       return werr;
-}
-
 /*
   called when a rid allocation request has completed
  */
@@ -147,11 +45,7 @@ static void drepl_new_rid_pool_callback(struct dreplsrv_service *service,
                DEBUG(3,(__location__ ": RID Manager completed RID allocation OK\n"));
        }
 
-       /* don't keep the connection open to the RID Manager */
-       talloc_free(service->ncchanges_extended.role_owner_source_dsa);
-       service->ncchanges_extended.role_owner_source_dsa = NULL;
-
-       service->ncchanges_extended.in_progress = false;
+       service->rid_alloc_in_progress = false;
 }
 
 /*
@@ -167,7 +61,10 @@ static WERROR drepl_request_new_rid_pool(struct dreplsrv_service *service,
                                                fsmo_role_dn,
                                                DRSUAPI_EXOP_FSMO_RID_ALLOC,
                                                alloc_pool,
-                                               drepl_new_rid_pool_callback);
+                                               drepl_new_rid_pool_callback, NULL);
+       if (W_ERROR_IS_OK(werr)) {
+               service->rid_alloc_in_progress = true;
+       }
        return werr;
 }
 
@@ -271,7 +168,7 @@ WERROR dreplsrv_ridalloc_check_rid_pool(struct dreplsrv_service *service)
        int ret;
        uint64_t alloc_pool;
 
-       if (service->ncchanges_extended.in_progress) {
+       if (service->rid_alloc_in_progress) {
                talloc_free(tmp_ctx);
                return WERR_OK;
        }