From 7ca2ceb333de6c4daad10890b3e3022e1930235c Mon Sep 17 00:00:00 2001 From: Crístian Deives Date: Mon, 30 Nov 2009 20:11:27 +1100 Subject: s4-drs: Create connection obejct (nTDSConnection) create nTDSConnection objects to match the list of servers Signed-off-by: Andrew Tridgell --- source4/dsdb/config.mk | 1 + source4/dsdb/kcc/kcc_connection.c | 124 ++++++++++++++++++++++++++++++++++++++ source4/dsdb/kcc/kcc_periodic.c | 5 ++ 3 files changed, 130 insertions(+) create mode 100644 source4/dsdb/kcc/kcc_connection.c (limited to 'source4/dsdb') diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk index ac4096d526..dfc5def64e 100644 --- a/source4/dsdb/config.mk +++ b/source4/dsdb/config.mk @@ -82,6 +82,7 @@ PRIVATE_DEPENDENCIES = \ KCC_SRV_OBJ_FILES = $(addprefix $(dsdbsrcdir)/kcc/, \ kcc_service.o \ + kcc_connection.o \ kcc_periodic.o) $(eval $(call proto_header_template,$(dsdbsrcdir)/kcc/kcc_service_proto.h,$(KCC_SRV_OBJ_FILES:.o=.c))) diff --git a/source4/dsdb/kcc/kcc_connection.c b/source4/dsdb/kcc/kcc_connection.c new file mode 100644 index 0000000000..762972b993 --- /dev/null +++ b/source4/dsdb/kcc/kcc_connection.c @@ -0,0 +1,124 @@ +/* + Unix SMB/CIFS implementation. + KCC service periodic handling + + Copyright (C) Crístian Deives + + 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 . + +*/ + +#include "includes.h" +#include "lib/events/events.h" +#include "dsdb/samdb/samdb.h" +#include "auth/auth.h" +#include "smbd/service.h" +#include "lib/messaging/irpc.h" +#include "dsdb/kcc/kcc_service.h" +#include "lib/ldb/include/ldb_errors.h" +#include "../lib/util/dlinklist.h" +#include "librpc/gen_ndr/ndr_misc.h" +#include "librpc/gen_ndr/ndr_drsuapi.h" +#include "librpc/gen_ndr/ndr_drsblobs.h" +#include "param/param.h" + +void kccsrv_apply_connections(struct ldb_dn **connections) +{ +} + +void kccsrv_create_connection(struct kccsrv_service *s, struct repsFromTo1 *r1) +{ + struct ldb_message *msg; + TALLOC_CTX *tmp_ctx; + struct ldb_dn *new_dn, *server_dn; + struct GUID guid; + const struct GUID *invocation_id; + struct ldb_val schedule_val; + int ret; + bool ok; + + tmp_ctx = talloc_new(s); + new_dn = samdb_ntds_settings_dn(s->samdb); + if (!new_dn) { + DEBUG(0, ("failed to find NTDS settings\n")); + goto done; + } + invocation_id = samdb_ntds_invocation_id(s->samdb); + guid = GUID_random(); + ok = ldb_dn_add_child_fmt(new_dn, "CN=%s", GUID_string(tmp_ctx, &guid)); + if (!ok) { + DEBUG(0, ("failed to create nTDSConnection DN\n")); + goto done; + } + ret = dsdb_find_dn_by_guid(s->samdb, tmp_ctx, GUID_string(tmp_ctx, + &r1->source_dsa_obj_guid), &server_dn); + if (ret != LDB_SUCCESS) { + DEBUG(0, ("failed to find fromServer DN '%s'\n", + GUID_string(tmp_ctx, &r1->source_dsa_obj_guid))); + goto done; + } + schedule_val = data_blob_const(r1->schedule, sizeof(r1->schedule)); + + msg = ldb_msg_new(tmp_ctx); + msg->dn = new_dn; + ldb_msg_add_string(msg, "invocationID", + GUID_string(tmp_ctx, invocation_id)); + ldb_msg_add_string(msg, "objectClass", "nTDSConnection"); + ldb_msg_add_string(msg, "showInAdvancedViewOnly", "TRUE"); + ldb_msg_add_string(msg, "enabledConnection", "TRUE"); + /* ldb_msg_add_dn(msg, "fromServer", server_dn); */ + ldb_msg_add_string(msg, "fromServer", ldb_dn_get_linearized(server_dn)); + ldb_msg_add_value(msg, "schedule", &schedule_val, NULL); + ldb_msg_add_string(msg, "options", "1"); + + ret = ldb_add(s->samdb, msg); + if (ret == LDB_SUCCESS) { + DEBUG(2, ("added nTDSConnection object '%s'\n", + ldb_dn_get_linearized(new_dn))); + } else { + DEBUG(0, ("failed to add an nTDSConnection object: %s\n", + ldb_strerror(ret))); + } + +done: + talloc_free(tmp_ctx); +} + +struct ldb_dn **kccsrv_find_connections(struct kccsrv_service *s, + TALLOC_CTX *mem_ctx) +{ + struct ldb_result *res; + int ret, i; + const char *attrs[] = { "distinguishedName", NULL }; + struct ldb_dn **connections; + + ret = ldb_search(s->samdb, mem_ctx, &res, s->config_dn, + LDB_SCOPE_ONELEVEL, attrs, "objectClass=nTDSDSA"); + if (ret != LDB_SUCCESS) { + DEBUG(0, ("failed nTDSDSA search: %s\n", ldb_strerror(ret))); + return NULL; + } + + for (i = 0; i < res->count; i++) { + connections = talloc_realloc(mem_ctx, connections, + struct ldb_dn *, i + 1); + connections[i] = samdb_result_dn(s->samdb, mem_ctx, + res->msgs[i], + "distinguishedName", NULL); + } + connections = talloc_realloc(mem_ctx, connections, struct ldb_dn *, + i + 1); + connections[i] = NULL; + return connections; +} diff --git a/source4/dsdb/kcc/kcc_periodic.c b/source4/dsdb/kcc/kcc_periodic.c index 097fff41ec..20deac49c5 100644 --- a/source4/dsdb/kcc/kcc_periodic.c +++ b/source4/dsdb/kcc/kcc_periodic.c @@ -122,6 +122,7 @@ NTSTATUS kccsrv_simple_update(struct kccsrv_service *s, TALLOC_CTX *mem_ctx) const char *attrs[] = { "objectGUID", "invocationID", NULL }; struct repsFromToBlob *reps = NULL; uint32_t count = 0; + struct ldb_dn **connections; ret = ldb_search(s->samdb, mem_ctx, &res, s->config_dn, LDB_SCOPE_SUBTREE, attrs, "objectClass=nTDSDSA"); @@ -160,9 +161,13 @@ NTSTATUS kccsrv_simple_update(struct kccsrv_service *s, TALLOC_CTX *mem_ctx) DRSUAPI_DS_REPLICA_NEIGHBOUR_SYNC_ON_STARTUP | DRSUAPI_DS_REPLICA_NEIGHBOUR_DO_SCHEDULED_SYNCS; memset(r1->schedule, 0x11, sizeof(r1->schedule)); + /* kccsrv_create_connection(s, r1); */ count++; } + connections = kccsrv_find_connections(s, mem_ctx); + kccsrv_apply_connections(connections); + return kccsrv_add_repsFrom(s, mem_ctx, reps, count); } -- cgit