diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-09-22 09:52:29 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-09-22 10:00:49 +1000 |
| commit | aba856c6668bbe56e2d84057bead31de1e08e2bd (patch) | |
| tree | 97fa80d598e56a3cd72b9451d1a208cc378debf1 /source4/dsdb/samdb/ldb_modules/partition.c | |
| parent | 8c3d77d84c9627c9ed4e1164d4844f83345fdbd6 (diff) | |
| download | samba-aba856c6668bbe56e2d84057bead31de1e08e2bd.tar.gz samba-aba856c6668bbe56e2d84057bead31de1e08e2bd.tar.bz2 samba-aba856c6668bbe56e2d84057bead31de1e08e2bd.zip | |
s4-dsdb: load the partialReplica attribute in the @PARTITION object
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
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/partition.c')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/partition.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c index 93f2d6be07..92918c798d 100644 --- a/source4/dsdb/samdb/ldb_modules/partition.c +++ b/source4/dsdb/samdb/ldb_modules/partition.c @@ -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: |