Codebase list slapi-nis / fc646c3
Add schema-compat-relevant-subtree Add a schema-compat-relevant-subtree configuration option, listing the only parts of the DIT that we should ever look at, either as source entries or as other entries which contain data which might be pulled in as part of computing the contents of compat entries. This is more or less the whitelist to schema-compat-ignore-subtree's blacklist. Nalin Dahyabhai 10 years ago
5 changed file(s) with 47 addition(s) and 5 deletion(s). Raw diff Collapse all Expand all
+5
-2
configure.ac less more
465465 schbaseattr=schema-compat-search-base
466466 AC_DEFINE_UNQUOTED(SCH_CONTAINER_CONFIGURATION_BASE_ATTR,"$schbaseattr",
467467 [Define to name of the attribute which lists the containers to search when locating entries to be used for constructing entries for a given container.])
468 schignoreattr=schema-compat-ignore-subtree
469 AC_DEFINE_UNQUOTED(SCH_CONTAINER_CONFIGURATION_IGNORE_SUBTREES_ATTR,"$schignoreattr",
468 schignoresubtreeattr=schema-compat-ignore-subtree
469 AC_DEFINE_UNQUOTED(SCH_CONTAINER_CONFIGURATION_IGNORE_SUBTREES_ATTR,"$schignoresubtreeattr",
470470 [Define to name of the attribute which lists the subtrees to ignore when locating entries and reading data to be used for constructing entries for a given container.])
471 schrelevantsubtreeattr=schema-compat-relevant-subtree
472 AC_DEFINE_UNQUOTED(SCH_CONTAINER_CONFIGURATION_RELEVANT_SUBTREES_ATTR,"$schrelevantsubtreeattr",
473 [Define to name of the attribute which lists the only subtrees which are relevant when locating entries and reading data to be used for constructing entries for a given container.])
471474 schfilterattr=schema-compat-search-filter
472475 AC_DEFINE_UNQUOTED(SCH_CONTAINER_CONFIGURATION_FILTER_ATTR,"$schfilterattr",
473476 [Define to name of the attribute which holds the filter for selecting entries to be used for constructing entries for a given container.])
+3
-0
src/back-nis.c less more
120120 ret->common.set = strdup(data->common.set);
121121 ret->common.bases = backend_shr_dup_strlist(data->common.bases);
122122 ret->common.entry_filter = strdup(data->common.entry_filter);
123 ret->common.relevant_subtrees = NULL;
123124 ret->common.ignore_subtrees = NULL;
124125 ret->common.rel_attrs = data->common.rel_attrs ?
125126 format_dup_attr_list(data->common.rel_attrs) :
604605 ret.common.set = strdup(map);
605606 ret.common.bases = use_bases;
606607 ret.common.entry_filter = use_entry_filter;
608 ret.common.relevant_subtrees = NULL;
607609 ret.common.ignore_subtrees = NULL;
608610 ret.common.rel_attrs = NULL;
609611 ret.common.rel_attr_list = NULL;
705707 free(ret.common.group);
706708 free(ret.common.set);
707709 backend_shr_free_strlist(ret.common.bases);
710 backend_shr_free_sdnlist(ret.common.relevant_subtrees);
708711 free(ret.disallowed_chars);
709712 free(ret.common.entry_filter);
710713 backend_shr_free_strlist(ret.key_formats);
+7
-1
src/back-sch.c less more
7878 free(set_data->common.group);
7979 free(set_data->common.set);
8080 free(set_data->common.bases);
81 backend_shr_free_sdnlist(set_data->common.relevant_subtrees);
8182 backend_shr_free_sdnlist(set_data->common.ignore_subtrees);
8283 format_free_attr_list(set_data->common.rel_attrs);
8384 free(set_data->common.rel_attr_list);
110111 ret->common.group = strdup(data->common.group);
111112 ret->common.set = strdup(data->common.set);
112113 ret->common.bases = backend_shr_dup_strlist(data->common.bases);
114 ret->common.relevant_subtrees = backend_shr_dup_sdnlist(data->common.relevant_subtrees);
113115 ret->common.ignore_subtrees = backend_shr_dup_sdnlist(data->common.ignore_subtrees);
114116 ret->common.rel_attrs = data->common.rel_attrs ?
115117 format_dup_attr_list(data->common.rel_attrs) :
161163 bool_t check_access;
162164 struct backend_set_data ret;
163165 Slapi_DN *tmp_sdn;
164 const Slapi_DN **ignore_subtrees;
166 const Slapi_DN **relevant_subtrees, **ignore_subtrees;
165167
166168 /* Read the values from the configuration entry. */
167169 bases = backend_shr_get_vattr_strlist(state, e,
168170 SCH_CONTAINER_CONFIGURATION_BASE_ATTR);
171 relevant_subtrees = backend_shr_get_vattr_sdnlist(state, e,
172 SCH_CONTAINER_CONFIGURATION_RELEVANT_SUBTREES_ATTR);
169173 ignore_subtrees = backend_shr_get_vattr_sdnlist(state, e,
170174 SCH_CONTAINER_CONFIGURATION_IGNORE_SUBTREES_ATTR);
171175 entry_filter = backend_shr_get_vattr_filter(state, e,
188192 slapi_sdn_free(&tmp_sdn);
189193 ret.common.set = strdup(container);
190194 ret.common.bases = bases;
195 ret.common.relevant_subtrees = relevant_subtrees;
191196 ret.common.ignore_subtrees = ignore_subtrees;
192197 ret.common.entry_filter = entry_filter;
193198 ret.common.rel_attrs = NULL;
253258 free(ret.common.group);
254259 free(ret.common.set);
255260 backend_shr_free_strlist(ret.common.bases);
261 backend_shr_free_sdnlist(ret.common.relevant_subtrees);
256262 backend_shr_free_sdnlist(ret.common.ignore_subtrees);
257263 free(ret.common.entry_filter);
258264 slapi_sdn_free(&ret.container_sdn);
+29
-2
src/back-shr.c less more
316316 {
317317 int i;
318318 for (i = 0; (sdnlist != NULL) && (sdnlist[i] != NULL); i++) {
319 slapi_sdn_free(&sdnlist[i]);
319 slapi_sdn_free((Slapi_DN **) &sdnlist[i]);
320320 sdnlist[i] = NULL;
321321 }
322322 free(sdnlist);
790790 backend_shr_entry_matches_set(struct backend_shr_set_data *set_data,
791791 Slapi_PBlock *pb, Slapi_Entry *e)
792792 {
793 const Slapi_DN **ignore_subtrees;
793 const Slapi_DN **relevant_subtrees, **ignore_subtrees;
794794 char **set_bases;
795795 char *set_filter;
796796 int i;
797797
798 relevant_subtrees = set_data->relevant_subtrees;
798799 ignore_subtrees = set_data->ignore_subtrees;
799800 set_bases = set_data->bases;
800801 set_filter = set_data->entry_filter;
806807 LDAP_SCOPE_SUBTREE) != 0) {
807808 return FALSE;
808809 }
810 }
811 }
812 if (relevant_subtrees != NULL) {
813 for (i = 0; relevant_subtrees[i] != NULL; i++) {
814 if (slapi_sdn_scope_test(slapi_entry_get_sdn_const(e),
815 relevant_subtrees[i],
816 LDAP_SCOPE_SUBTREE) != 0) {
817 break;
818 }
819 }
820 if (relevant_subtrees[i] == NULL) {
821 /* Non-empty list, but no match. */
822 return FALSE;
809823 }
810824 }
811825
10101024 /* Yeah, we're done here. */
10111025 return TRUE;
10121026 }
1027 }
1028 }
1029 if (set_data->relevant_subtrees != NULL) {
1030 for (i = 0; set_data->relevant_subtrees[i] != NULL; i++) {
1031 if (slapi_sdn_scope_test(slapi_entry_get_sdn_const(cbdata->e),
1032 set_data->relevant_subtrees[i],
1033 LDAP_SCOPE_SUBTREE) != 0) {
1034 break;
1035 }
1036 }
1037 if (set_data->relevant_subtrees[i] == NULL) {
1038 /* Non-empty list, but no match. */
1039 return TRUE;
10131040 }
10141041 }
10151042
+3
-0
src/backend.h less more
4545 /* Configuration flag indicating whether or not we try to skip
4646 * recomputing data in this map. */
4747 unsigned int skip_uninteresting_updates:1;
48 /* Subtrees under which all of the contents that we care about will be
49 * stored. Other locaoins will be silently ignored. */
50 const struct slapi_dn **relevant_subtrees;
4851 /* Subtrees under which we ignore contents. */
4952 const struct slapi_dn **ignore_subtrees;
5053 struct backend_set_data *self;