diff options
| author | Nalin Dahyabhai <nalin@dahyabhai.net> | 2013-08-06 14:53:34 -0400 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@dahyabhai.net> | 2013-08-12 15:43:31 -0400 |
| commit | 4bc0ce64e49f61b36f9f70c708aff7937957b638 (patch) | |
| tree | cca8a4862723c26ba9e4e929b2d0ab378ec89fbd /src/back-sch-nss.c | |
| parent | 1fd0b0b83cf6fb70f525e2c5bf13ad9fa315579f (diff) | |
| download | slapi-nis-4bc0ce64e49f61b36f9f70c708aff7937957b638.tar.gz slapi-nis-4bc0ce64e49f61b36f9f70c708aff7937957b638.tar.xz slapi-nis-4bc0ce64e49f61b36f9f70c708aff7937957b638.zip | |
Compare object class names in bervals correctly
Avoid possibly getting thrown by searches where a specified object class
is a prefix of one that we're looking for.
Diffstat (limited to 'src/back-sch-nss.c')
| -rw-r--r-- | src/back-sch-nss.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/src/back-sch-nss.c b/src/back-sch-nss.c index c1ddb3c..a45d42d 100644 --- a/src/back-sch-nss.c +++ b/src/back-sch-nss.c @@ -63,8 +63,26 @@ struct backend_search_filter_config { char *name; }; +static int +bvstrcasecmp(const struct berval *bval, const char *s) +{ + ssize_t len; + int c; + + len = strlen(s); + if (strlen(s) == bval->bv_len) { + return strncasecmp(bval->bv_val, s, len); + } + c = strncasecmp(bval->bv_val, s, MIN(bval->bv_len, len)); + if (c != 0) { + return c; + } + return bval->bv_len - strlen(s); +} + /* Check simple filter to see if it has - * (cn|uid|uidNumber|gidNumber|memberUid=<value>) or (objectClass=posixGroup|shadowAccount) + * (cn|uid|uidNumber|gidNumber|memberUid=<value>) or + * (objectClass=posixGroup|shadowAccount) * Called by slapi_filter_apply(). */ static int backend_search_filter_has_cn_uid(Slapi_Filter *filter, void *arg) @@ -92,10 +110,10 @@ backend_search_filter_has_cn_uid(Slapi_Filter *filter, void *arg) config->name_set = TRUE; config->search_members = TRUE; } else if ((0 == strcasecmp(filter_type, "objectClass")) && - (0 == strncasecmp(bval->bv_val, "posixGroup", bval->bv_len))) { + (0 == bvstrcasecmp(bval, "posixGroup"))) { config->search_group = TRUE; } else if ((0 == strcasecmp(filter_type, "objectClass")) && - (0 == strncasecmp(bval->bv_val, "shadowAccount", bval->bv_len))) { + (0 == bvstrcasecmp(bval, "shadowAccount"))) { config->wrong_search = TRUE; } |