From b52485b34b0d94e97a4d64a71a4448378eb43053 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 25 Apr 2016 11:21:13 +0200 Subject: [PATCH] libnm/vpn: fix checking service name in nm_vpn_plugin_info_new_search_file() Fixes: 3adf782ab556e343a34f0153f50f72a2fd0ee791 --- libnm-core/nm-vpn-plugin-info.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/libnm-core/nm-vpn-plugin-info.c b/libnm-core/nm-vpn-plugin-info.c index 90099cd0a..11393b54f 100644 --- a/libnm-core/nm-vpn-plugin-info.c +++ b/libnm-core/nm-vpn-plugin-info.c @@ -395,18 +395,14 @@ nm_vpn_plugin_info_new_search_file (const char *name, const char *service) for (info = infos; info; info = info->next) { NMVpnPluginInfo *p = info->data; - char **aliases; if (name && !nm_streq (nm_vpn_plugin_info_get_name (p), name)) continue; - if (service) { - if (!nm_streq (nm_vpn_plugin_info_get_service (p), service)) - continue; - - aliases = NM_VPN_PLUGIN_INFO_GET_PRIVATE (p)->aliases; - if (_nm_utils_strv_find_first (aliases, -1, service) < 0) - continue; - } + if ( service + && !nm_streq (nm_vpn_plugin_info_get_service (p), service) + && (_nm_utils_strv_find_first (NM_VPN_PLUGIN_INFO_GET_PRIVATE (p)->aliases, + -1, service) < 0)) + continue; plugin_info = g_object_ref (p); break; }