diff options
| -rw-r--r-- | src/providers/ldap/ldap_common.h | 4 | ||||
| -rw-r--r-- | src/providers/ldap/sdap_utils.c | 30 |
2 files changed, 27 insertions, 7 deletions
diff --git a/src/providers/ldap/ldap_common.h b/src/providers/ldap/ldap_common.h index e5fee51e7..bdd02d822 100644 --- a/src/providers/ldap/ldap_common.h +++ b/src/providers/ldap/ldap_common.h @@ -264,6 +264,10 @@ errno_t list_missing_attrs(TALLOC_CTX *mem_ctx, bool sdap_is_secure_uri(const char *uri); +char *sdap_or_filters(TALLOC_CTX *mem_ctx, + const char *base_filter, + const char *extra_filter); + char *sdap_combine_filters(TALLOC_CTX *mem_ctx, const char *base_filter, const char *extra_filter); diff --git a/src/providers/ldap/sdap_utils.c b/src/providers/ldap/sdap_utils.c index 47921b876..347206c21 100644 --- a/src/providers/ldap/sdap_utils.c +++ b/src/providers/ldap/sdap_utils.c @@ -149,9 +149,11 @@ errno_t deref_string_to_val(const char *str, int *val) return EOK; } -char *sdap_combine_filters(TALLOC_CTX *mem_ctx, - const char *base_filter, - const char *extra_filter) +static char * +sdap_combine_filters_ex(TALLOC_CTX *mem_ctx, + char operator, + const char *base_filter, + const char *extra_filter) { char *filter = NULL; @@ -162,12 +164,26 @@ char *sdap_combine_filters(TALLOC_CTX *mem_ctx, } if (extra_filter[0] == '(') { - filter = talloc_asprintf(mem_ctx, "(&%s%s)", - base_filter, extra_filter); + filter = talloc_asprintf(mem_ctx, "(%c%s%s)", + operator, base_filter, extra_filter); } else { - filter = talloc_asprintf(mem_ctx, "(&%s(%s))", - base_filter, extra_filter); + filter = talloc_asprintf(mem_ctx, "(%c%s(%s))", + operator, base_filter, extra_filter); } return filter; /* NULL or not */ } + +char *sdap_or_filters(TALLOC_CTX *mem_ctx, + const char *base_filter, + const char *extra_filter) +{ + return sdap_combine_filters_ex(mem_ctx, '|', base_filter, extra_filter); +} + +char *sdap_combine_filters(TALLOC_CTX *mem_ctx, + const char *base_filter, + const char *extra_filter) +{ + return sdap_combine_filters_ex(mem_ctx, '&', base_filter, extra_filter); +} |