fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-28 00:30:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm/vpn: consider VPN service aliases in nm_vpn_plugin_info_new_search_file()

Browse source 
Fixes: 4271c9650c
This commit is contained in:
Thomas Haller 2016-04-25 11:21:13 +02:00
parent 8280ab69f1
commit 3adf782ab5
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libnm-core/nm-vpn-plugin-info.c
View file

@ -394,11 +394,21 @@ nm_vpn_plugin_info_new_search_file (const char *name, const char *service)
infos = _nm_vpn_plugin_info_list_load_dir (dir[i], TRUE, uid, NULL, NULL);
for (info = infos; info; info = info->next) {
if ( (!name || nm_streq (nm_vpn_plugin_info_get_name (info->data), name))
&& (!service || nm_streq (nm_vpn_plugin_info_get_service (info->data), service))) {
plugin_info = g_object_ref (info->data);
break;
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;
}
plugin_info = g_object_ref (p);
break;
}
g_slist_free_full (infos, g_object_unref);