colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm/vpn: fix checking service name in nm_vpn_plugin_info_new_search_file()

Browse Source 
Fixes: 3adf782ab5
This commit is contained in:
Thomas Haller
2016-04-25 11:21:13 +02:00
parent eafa6f725b
commit b52485b34b
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libnm-core/nm-vpn-plugin-info.c
View File

@@ -395,18 +395,14 @@ nm_vpn_plugin_info_new_search_file (const char *name, const char *service)
for (info = infos; info; info = info->next) { for (info = infos; info; info = info->next) {
NMVpnPluginInfo *p = info->data; NMVpnPluginInfo *p = info->data;
char **aliases;
if (name && !nm_streq (nm_vpn_plugin_info_get_name (p), name)) if (name && !nm_streq (nm_vpn_plugin_info_get_name (p), name))
continue; continue;
if (service) { if ( service
if (!nm_streq (nm_vpn_plugin_info_get_service (p), 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; continue;
aliases = NM_VPN_PLUGIN_INFO_GET_PRIVATE (p)->aliases;
if (_nm_utils_strv_find_first (aliases, -1, service) < 0)
continue;
}
plugin_info = g_object_ref (p); plugin_info = g_object_ref (p);
break; break;
} }