diff options
| author | Pavel Březina <pbrezina@redhat.com> | 2015-12-18 14:23:56 +0100 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2016-01-19 14:32:57 +0100 |
| commit | 1d3f5fc2802c218916e6d6bc98eeaed79c66bafe (patch) | |
| tree | 012967bce21da60d48752ac15d64b639062d1a4f /src | |
| parent | 92ec40e6aa25f75903ffdb166a8ec56b67bfd77d (diff) | |
| download | sssd-1d3f5fc2802c218916e6d6bc98eeaed79c66bafe.tar.gz sssd-1d3f5fc2802c218916e6d6bc98eeaed79c66bafe.tar.xz sssd-1d3f5fc2802c218916e6d6bc98eeaed79c66bafe.zip | |
SDAP: support empty filters in sdap_combine_filters()
Reviewed-by: Sumit Bose <sbose@redhat.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/providers/ldap/sdap_utils.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/providers/ldap/sdap_utils.c b/src/providers/ldap/sdap_utils.c index 7a96f81a..47921b87 100644 --- a/src/providers/ldap/sdap_utils.c +++ b/src/providers/ldap/sdap_utils.c @@ -155,8 +155,10 @@ char *sdap_combine_filters(TALLOC_CTX *mem_ctx, { char *filter = NULL; - if (!extra_filter) { + if (extra_filter == NULL || extra_filter[0] == '\0') { return talloc_strdup(mem_ctx, base_filter); + } else if (base_filter == NULL || base_filter[0] == '\0') { + return talloc_strdup(mem_ctx, extra_filter); } if (extra_filter[0] == '(') { @@ -166,5 +168,6 @@ char *sdap_combine_filters(TALLOC_CTX *mem_ctx, filter = talloc_asprintf(mem_ctx, "(&%s(%s))", base_filter, extra_filter); } + return filter; /* NULL or not */ } |