summaryrefslogtreecommitdiff
path: root/source4/dsdb
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-09-15 16:19:26 +1000
committerAndrew Tridgell <tridge@samba.org>2010-09-16 07:24:00 +1000
commitf89f3cf30fad625d03de600b85e542791125c8f5 (patch)
tree42f656255581e3c0b14c48af4f483f9fa9437208 /source4/dsdb
parent54b53704747f45757642c9d4a17645ac777dc9ea (diff)
downloadsamba-f89f3cf30fad625d03de600b85e542791125c8f5.tar.gz
samba-f89f3cf30fad625d03de600b85e542791125c8f5.tar.bz2
samba-f89f3cf30fad625d03de600b85e542791125c8f5.zip
s4-repl: split out the extended op handling
this is not part of the rid allocation logic Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/dsdb')
-rw-r--r--source4/dsdb/repl/drepl_extended.c168
-rw-r--r--source4/dsdb/repl/drepl_ridalloc.c136
-rw-r--r--source4/dsdb/wscript_build2
3 files changed, 169 insertions, 137 deletions
diff --git a/source4/dsdb/repl/drepl_extended.c b/source4/dsdb/repl/drepl_extended.c
new file mode 100644
index 0000000000..41fe38b937
--- /dev/null
+++ b/source4/dsdb/repl/drepl_extended.c
@@ -0,0 +1,168 @@
+/*
+ Unix SMB/CIFS mplementation.
+
+ DSDB replication service - extended operation code
+
+ Copyright (C) Andrew Tridgell 2010
+ Copyright (C) Andrew Bartlett 2010
+ Copyright (C) Nadezhda Ivanova 2010
+
+ based on drepl_notify.c
+
+ 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 3 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, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "includes.h"
+#include "ldb_module.h"
+#include "dsdb/samdb/samdb.h"
+#include "smbd/service.h"
+#include "dsdb/repl/drepl_service.h"
+#include "param/param.h"
+
+
+/*
+ create the role owner source dsa structure
+
+ nc_dn: the DN of the subtree being replicated
+ source_dsa_dn: the DN of the server that we are replicating from
+ */
+static WERROR drepl_create_extended_source_dsa(struct dreplsrv_service *service,
+ struct ldb_dn *nc_dn,
+ struct ldb_dn *source_dsa_dn,
+ struct dreplsrv_partition_source_dsa **_sdsa)
+{
+ 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, nc_dn);
+ if (!sdsa->partition->dn) {
+ talloc_free(sdsa);
+ return WERR_NOMEM;
+ }
+ sdsa->partition->nc.dn = ldb_dn_alloc_linearized(sdsa->partition, nc_dn);
+ if (!sdsa->partition->nc.dn) {
+ talloc_free(sdsa);
+ return WERR_NOMEM;
+ }
+ ret = dsdb_find_guid_by_dn(ldb, nc_dn, &sdsa->partition->nc.guid);
+ if (ret != LDB_SUCCESS) {
+ DEBUG(0,(__location__ ": Failed to find GUID for %s\n",
+ ldb_dn_get_linearized(nc_dn)));
+ talloc_free(sdsa);
+ return WERR_DS_DRA_INTERNAL_ERROR;
+ }
+
+ sdsa->repsFrom1 = &sdsa->_repsFromBlob.ctr.ctr1;
+ ret = dsdb_find_guid_by_dn(ldb, source_dsa_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(source_dsa_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(nc_dn)));
+ talloc_free(sdsa);
+ return werr;
+ }
+
+ *_sdsa = sdsa;
+ return WERR_OK;
+}
+
+struct extended_op_data {
+ dreplsrv_fsmo_callback_t callback;
+ void *callback_data;
+ struct dreplsrv_partition_source_dsa *sdsa;
+};
+
+/*
+ called when an extended op finishes
+ */
+static void extended_op_callback(struct dreplsrv_service *service,
+ WERROR err,
+ enum drsuapi_DsExtendedError exop_error,
+ void *cb_data)
+{
+ struct extended_op_data *data = talloc_get_type_abort(cb_data, struct extended_op_data);
+ talloc_free(data->sdsa);
+ data->callback(service, err, exop_error, data->callback_data);
+ talloc_free(data);
+}
+
+/*
+ schedule a getncchanges request to the role owner for an extended operation
+ */
+WERROR drepl_request_extended_op(struct dreplsrv_service *service,
+ struct ldb_dn *role_owner_dn,
+ struct ldb_dn *fsmo_role_dn,
+ enum drsuapi_DsExtendedOperation extended_op,
+ uint64_t fsmo_info,
+ dreplsrv_fsmo_callback_t callback,
+ void *callback_data)
+{
+ WERROR werr;
+ struct extended_op_data *data;
+ struct dreplsrv_partition_source_dsa *sdsa;
+
+ werr = drepl_create_extended_source_dsa(service, role_owner_dn, fsmo_role_dn, &sdsa);
+ W_ERROR_NOT_OK_RETURN(werr);
+
+ data = talloc(service, struct extended_op_data);
+ W_ERROR_HAVE_NO_MEMORY(data);
+
+ data->callback = callback;
+ data->callback_data = callback_data;
+ data->sdsa = sdsa;
+
+ werr = dreplsrv_schedule_partition_pull_source(service, sdsa,
+ extended_op, fsmo_info,
+ extended_op_callback, data);
+ if (!W_ERROR_IS_OK(werr)) {
+ talloc_free(sdsa);
+ talloc_free(data);
+ }
+ return werr;
+}
diff --git a/source4/dsdb/repl/drepl_ridalloc.c b/source4/dsdb/repl/drepl_ridalloc.c
index cc41db1360..ff5bb163e7 100644
--- a/source4/dsdb/repl/drepl_ridalloc.c
+++ b/source4/dsdb/repl/drepl_ridalloc.c
@@ -30,142 +30,6 @@
#include "dsdb/repl/drepl_service.h"
#include "param/param.h"
-
-/*
- create the role owner source dsa structure
-
- nc_dn: the DN of the subtree being replicated
- source_dsa_dn: the DN of the server that we are replicating from
- */
-WERROR drepl_create_role_owner_source_dsa(struct dreplsrv_service *service,
- struct ldb_dn *nc_dn,
- struct ldb_dn *source_dsa_dn,
- struct dreplsrv_partition_source_dsa **_sdsa)
-{
- 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, nc_dn);
- if (!sdsa->partition->dn) {
- talloc_free(sdsa);
- return WERR_NOMEM;
- }
- sdsa->partition->nc.dn = ldb_dn_alloc_linearized(sdsa->partition, nc_dn);
- if (!sdsa->partition->nc.dn) {
- talloc_free(sdsa);
- return WERR_NOMEM;
- }
- ret = dsdb_find_guid_by_dn(ldb, nc_dn, &sdsa->partition->nc.guid);
- if (ret != LDB_SUCCESS) {
- DEBUG(0,(__location__ ": Failed to find GUID for %s\n",
- ldb_dn_get_linearized(nc_dn)));
- talloc_free(sdsa);
- return WERR_DS_DRA_INTERNAL_ERROR;
- }
-
- sdsa->repsFrom1 = &sdsa->_repsFromBlob.ctr.ctr1;
- ret = dsdb_find_guid_by_dn(ldb, source_dsa_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(source_dsa_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(nc_dn)));
- talloc_free(sdsa);
- return werr;
- }
-
- *_sdsa = sdsa;
- return WERR_OK;
-}
-
-struct extended_op_data {
- dreplsrv_fsmo_callback_t callback;
- void *callback_data;
- struct dreplsrv_partition_source_dsa *sdsa;
-};
-
-/*
- called when an extended op finishes
- */
-static void extended_op_callback(struct dreplsrv_service *service,
- WERROR err,
- enum drsuapi_DsExtendedError exop_error,
- void *cb_data)
-{
- struct extended_op_data *data = talloc_get_type_abort(cb_data, struct extended_op_data);
- talloc_free(data->sdsa);
- data->callback(service, err, exop_error, data->callback_data);
- talloc_free(data);
-}
-
-/*
- 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 fsmo_info,
- dreplsrv_fsmo_callback_t callback,
- void *callback_data)
-{
- WERROR werr;
- struct extended_op_data *data;
- struct dreplsrv_partition_source_dsa *sdsa;
-
- werr = drepl_create_role_owner_source_dsa(service, role_owner_dn, fsmo_role_dn, &sdsa);
- W_ERROR_NOT_OK_RETURN(werr);
-
- data = talloc(service, struct extended_op_data);
- W_ERROR_HAVE_NO_MEMORY(data);
-
- data->callback = callback;
- data->callback_data = callback_data;
- data->sdsa = sdsa;
-
- werr = dreplsrv_schedule_partition_pull_source(service, sdsa,
- extended_op, fsmo_info,
- extended_op_callback, data);
- if (!W_ERROR_IS_OK(werr)) {
- talloc_free(sdsa);
- talloc_free(data);
- }
- return werr;
-}
-
/*
called when a rid allocation request has completed
*/
diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
index 0f1b385436..bc9bd13656 100644
--- a/source4/dsdb/wscript_build
+++ b/source4/dsdb/wscript_build
@@ -25,7 +25,7 @@ bld.SAMBA_SUBSYSTEM('SAMDB_SCHEMA',
bld.SAMBA_MODULE('DREPL_SRV',
- source='repl/drepl_service.c repl/drepl_periodic.c repl/drepl_partitions.c repl/drepl_out_pull.c repl/drepl_out_helpers.c repl/drepl_notify.c repl/drepl_ridalloc.c repl/drepl_fsmo.c',
+ source='repl/drepl_service.c repl/drepl_periodic.c repl/drepl_partitions.c repl/drepl_out_pull.c repl/drepl_out_helpers.c repl/drepl_notify.c repl/drepl_ridalloc.c repl/drepl_extended.c repl/drepl_fsmo.c',
autoproto='repl/drepl_service_proto.h',
subsystem='service',
init_function='server_service_drepl_init',