sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

s4-dsdb: load the partialReplica attribute in the @PARTITION object

Browse Source 
this modifies the partition module to honor a partialReplica attribute
on the @PARTITION module, marking partiations as partial replicas so
the NO_GLOBAL_CATALOG control can be honoured
This commit is contained in:
Andrew Tridgell
2011-09-22 09:52:29 +10:00
parent 8c3d77d84c
commit aba856c666
3 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source4/dsdb/samdb/ldb_modules/partition.c
View File

@ -543,6 +543,7 @@ static int partition_search(struct ldb_module *module, struct ldb_request *req)
struct ldb_control *search_control = ldb_request_get_control(req, LDB_CONTROL_SEARCH_OPTIONS_OID);
struct ldb_control *domain_scope_control = ldb_request_get_control(req, LDB_CONTROL_DOMAIN_SCOPE_OID);
struct ldb_control *no_gc_control = ldb_request_get_control(req, DSDB_CONTROL_NO_GLOBAL_CATALOG);
struct ldb_search_options_control *search_options = NULL;
struct dsdb_partition *p;
@ -618,6 +619,17 @@ static int partition_search(struct ldb_module *module, struct ldb_request *req)
for (i=0; data->partitions[i]; i++) {
bool match = false, stop = false;
if (data->partitions[i]->partial_replica && no_gc_control != NULL) {
if (ldb_dn_compare_base(data->partitions[i]->ctrl->dn,
req->op.search.base) == 0) {
/* base DN is in a partial replica
with the NO_GLOBAL_CATALOG
control. This partition is invisible */
/* DEBUG(0,("DENYING NON-GC OP: %s\n", ldb_module_call_chain(req, req))); */
continue;
}
}
if (phantom_root) {
/* Phantom root: Find all partitions under the
* search base. We match if:

1
source4/dsdb/samdb/ldb_modules/partition.h
View File

@ -31,6 +31,7 @@ struct dsdb_partition {
struct dsdb_control_current_partition *ctrl;
const char *backend_url;
DATA_BLOB orig_record;
bool partial_replica; /* a GC partition */
};
struct partition_module {

16
source4/dsdb/samdb/ldb_modules/partition_init.c
View File

@ -138,7 +138,8 @@ static int partition_reload_metadata(struct ldb_module *module, struct partition
struct ldb_message *msg, *module_msg;
struct ldb_result *res;
struct ldb_context *ldb = ldb_module_get_ctx(module);
const char *attrs[] = { "partition", "replicateEntries", "modules", "ldapBackend", NULL };
const char *attrs[] = { "partition", "replicateEntries", "modules", "ldapBackend",
"partialReplica", NULL };
/* perform search for @PARTITION, looking for module, replicateEntries and ldapBackend */
ret = dsdb_module_search_dn(module, mem_ctx, &res,
ldb_dn_new(mem_ctx, ldb, DSDB_PARTITION_DN),
@ -208,7 +209,7 @@ static int new_partition_from_dn(struct ldb_context *ldb, struct partition_priva
const char **modules;
int ret;
(*partition) = talloc(mem_ctx, struct dsdb_partition);
(*partition) = talloc_zero(mem_ctx, struct dsdb_partition);
if (!*partition) {
return ldb_oom(ldb);
}
@ -383,6 +384,7 @@ int partition_reload_if_required(struct ldb_module *module,
struct ldb_context *ldb = ldb_module_get_ctx(module);
struct ldb_message *msg;
struct ldb_message_element *partition_attributes;
struct ldb_message_element *partial_replicas;
TALLOC_CTX *mem_ctx;
if (!data) {
@ -414,6 +416,7 @@ int partition_reload_if_required(struct ldb_module *module,
data->metadata_seq = seq;
partition_attributes = ldb_msg_find_element(msg, "partition");
partial_replicas = ldb_msg_find_element(msg, "partialReplica");
for (i=0; partition_attributes && i < partition_attributes->num_values; i++) {
unsigned int j;
@ -523,6 +526,15 @@ int partition_reload_if_required(struct ldb_module *module,
return ret;
}
/* see if it is a partial replica */
for (j=0; partial_replicas && j<partial_replicas->num_values; j++) {
struct ldb_dn *pa_dn = ldb_dn_from_ldb_val(mem_ctx, ldb, &partial_replicas->values[j]);
if (pa_dn != NULL && ldb_dn_compare(pa_dn, partition->ctrl->dn) == 0) {
partition->partial_replica = true;
}
talloc_free(pa_dn);
}
ret = add_partition_to_data(ldb, data, partition);
if (ret != LDB_SUCCESS) {
talloc_free(mem_ctx);