diff options
author | Rich Megginson <rmeggins@redhat.com> | 2010-02-08 08:57:52 -0700 |
---|---|---|
committer | Rich Megginson <rmeggins@redhat.com> | 2010-02-17 15:04:02 -0700 |
commit | 834c706f04e53bb3ca95caa31c6e1166ad79210e (patch) | |
tree | e002cfe1db898002465b4545c6b38be39b9d615e /ldap/servers/slapd/schema.c | |
parent | 3e5e21c68afc5ff38d0d843fafaddd145e4d38f5 (diff) | |
download | ds-834c706f04e53bb3ca95caa31c6e1166ad79210e.tar.gz ds-834c706f04e53bb3ca95caa31c6e1166ad79210e.tar.xz ds-834c706f04e53bb3ca95caa31c6e1166ad79210e.zip |
Do not use syntax plugins directly for filters, indexing
There were many places in the server code that directly used the syntax
plugin for the attribute. If the attribute schema definition specified
a matching rule, we must use that matching rule for matching values of
that attribute, filtering that attribute, and generating index keys for
values of that attribute. New internal and plugin APIs have been added
that use the Slapi_Attr* instead of using the syntax plugin directly.
The new API will determine which matching rule to apply based on the
schema definition.
Diffstat (limited to 'ldap/servers/slapd/schema.c')
-rw-r--r-- | ldap/servers/slapd/schema.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ldap/servers/slapd/schema.c b/ldap/servers/slapd/schema.c index 98224df6..dadc307d 100644 --- a/ldap/servers/slapd/schema.c +++ b/ldap/servers/slapd/schema.c @@ -1180,7 +1180,7 @@ schema_attr_enum_callback(struct asyntaxinfo *asip, void *arg) } } - syntaxoid = plugin_syntax2oid(asip->asi_plugin); + syntaxoid = asip->asi_plugin->plg_syntax_oid; if ( !aew->schema_ds4x_compat && asip->asi_syntaxlength != SLAPI_SYNTAXLENGTH_NONE ) { @@ -3410,7 +3410,7 @@ read_at_ldif(const char *input, struct asyntaxinfo **asipp, char *errorbuf, /* We only want to use the parent syntax if a SYNTAX * wasn't explicitly specified for this attribute. */ } else if (NULL == pSyntax) { - char *pso = plugin_syntax2oid(asi_parent->asi_plugin); + char *pso = asi_parent->asi_plugin->plg_syntax_oid; if (pso) { slapi_ch_free ((void **)&pSyntax); |