From 6730ad84968681d86ff7d82751fe886a2f138673 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Wed, 9 Dec 2009 04:00:09 +0100 Subject: Consolidate code for splitting strings by separator There were two functions for parsing strings by a separator. This patch consolidates on the one previously used in confdb. This also allows stripping the tokens of whitespace. Fixes: #319 --- server/providers/ldap/ldap_common.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'server/providers/ldap') diff --git a/server/providers/ldap/ldap_common.c b/server/providers/ldap/ldap_common.c index e4f3f6bbf..74b478ccd 100644 --- a/server/providers/ldap/ldap_common.c +++ b/server/providers/ldap/ldap_common.c @@ -503,7 +503,6 @@ int sdap_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx, struct sdap_service *service; LDAPURLDesc *lud; char **list = NULL; - int count = 0; int ret; int i; @@ -531,14 +530,14 @@ int sdap_service_init(TALLOC_CTX *memctx, struct be_ctx *ctx, } /* split server parm into a list */ - ret = sss_split_list(tmp_ctx, urls, ", ", &list, &count); + ret = split_on_separator(tmp_ctx, urls, ',', true, &list, NULL); if (ret != EOK) { DEBUG(1, ("Failed to parse server list!\n")); goto done; } /* now for each URI add a new server to the failover service */ - for (i = 0; i < count; i++) { + for (i = 0; list[i]; i++) { ret = ldap_url_parse(list[i], &lud); if (ret != LDAP_SUCCESS) { DEBUG(0, ("Failed to parse ldap URI (%s)!\n", list[i])); -- cgit