dpward / rpms / sssd

Forked from rpms/sssd 3 years ago
Clone
Blob Blame History Raw
From e4fd5c67a8f63062b17e615ce746a19994ee310c Mon Sep 17 00:00:00 2001
From: Petr Cech <pcech@redhat.com>
Date: Wed, 27 Jul 2016 11:13:04 +0200
Subject: [PATCH 71/74] Revert "LDAP: Lookup services by all protocols unless a
 protocol is specified"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit aa58e216c1f794bd335151f19e79adbb3ddf4c73.

Reviewed-by: Pavel Březina <pbrezina@redhat.com>
---
 src/providers/ldap/ldap_id_services.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/providers/ldap/ldap_id_services.c b/src/providers/ldap/ldap_id_services.c
index 401228c20af31ae2df9bb3d35ed25fb6f06b1839..77215127b53297d840eaa4d2f35a75eedb085e43 100644
--- a/src/providers/ldap/ldap_id_services.c
+++ b/src/providers/ldap/ldap_id_services.c
@@ -89,9 +89,6 @@ services_get_send(TALLOC_CTX *mem_ctx,
     state->sysdb = sdom->dom->sysdb;
     state->name = name;
     state->protocol = protocol;
-    if (state->protocol != NULL && state->protocol[0] == '\0') {
-        state->protocol = NULL;
-    }
     state->filter_type = filter_type;
     state->noexist_delete = noexist_delete;
 
@@ -117,8 +114,8 @@ services_get_send(TALLOC_CTX *mem_ctx,
     ret = sss_filter_sanitize(state, name, &clean_name);
     if (ret != EOK)  goto error;
 
-    if (state->protocol != NULL) {
-        ret = sss_filter_sanitize(state, state->protocol, &clean_protocol);
+    if (protocol) {
+        ret = sss_filter_sanitize(state, protocol, &clean_protocol);
         if (ret != EOK)  goto error;
     }
 
-- 
2.4.11