|
 |
b2d430 |
From e4fd5c67a8f63062b17e615ce746a19994ee310c Mon Sep 17 00:00:00 2001
|
|
|
b2d430 |
From: Petr Cech <pcech@redhat.com>
|
|
|
b2d430 |
Date: Wed, 27 Jul 2016 11:13:04 +0200
|
|
|
b2d430 |
Subject: [PATCH 71/74] Revert "LDAP: Lookup services by all protocols unless a
|
|
|
b2d430 |
protocol is specified"
|
|
|
b2d430 |
MIME-Version: 1.0
|
|
|
b2d430 |
Content-Type: text/plain; charset=UTF-8
|
|
|
b2d430 |
Content-Transfer-Encoding: 8bit
|
|
|
b2d430 |
|
|
|
b2d430 |
This reverts commit aa58e216c1f794bd335151f19e79adbb3ddf4c73.
|
|
|
b2d430 |
|
|
|
b2d430 |
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
|
|
|
b2d430 |
---
|
|
|
b2d430 |
src/providers/ldap/ldap_id_services.c | 7 ++-----
|
|
|
b2d430 |
1 file changed, 2 insertions(+), 5 deletions(-)
|
|
|
b2d430 |
|
|
|
b2d430 |
diff --git a/src/providers/ldap/ldap_id_services.c b/src/providers/ldap/ldap_id_services.c
|
|
|
b2d430 |
index 401228c20af31ae2df9bb3d35ed25fb6f06b1839..77215127b53297d840eaa4d2f35a75eedb085e43 100644
|
|
|
b2d430 |
--- a/src/providers/ldap/ldap_id_services.c
|
|
|
b2d430 |
+++ b/src/providers/ldap/ldap_id_services.c
|
|
|
b2d430 |
@@ -89,9 +89,6 @@ services_get_send(TALLOC_CTX *mem_ctx,
|
|
|
b2d430 |
state->sysdb = sdom->dom->sysdb;
|
|
|
b2d430 |
state->name = name;
|
|
|
b2d430 |
state->protocol = protocol;
|
|
|
b2d430 |
- if (state->protocol != NULL && state->protocol[0] == '\0') {
|
|
|
b2d430 |
- state->protocol = NULL;
|
|
|
b2d430 |
- }
|
|
|
b2d430 |
state->filter_type = filter_type;
|
|
|
b2d430 |
state->noexist_delete = noexist_delete;
|
|
|
b2d430 |
|
|
|
b2d430 |
@@ -117,8 +114,8 @@ services_get_send(TALLOC_CTX *mem_ctx,
|
|
|
b2d430 |
ret = sss_filter_sanitize(state, name, &clean_name);
|
|
|
b2d430 |
if (ret != EOK) goto error;
|
|
|
b2d430 |
|
|
|
b2d430 |
- if (state->protocol != NULL) {
|
|
|
b2d430 |
- ret = sss_filter_sanitize(state, state->protocol, &clean_protocol);
|
|
|
b2d430 |
+ if (protocol) {
|
|
|
b2d430 |
+ ret = sss_filter_sanitize(state, protocol, &clean_protocol);
|
|
|
b2d430 |
if (ret != EOK) goto error;
|
|
|
b2d430 |
}
|
|
|
b2d430 |
|
|
|
b2d430 |
--
|
|
|
b2d430 |
2.4.11
|
|
|
b2d430 |
|