fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-14 15:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: Only escape VPN banner if it's present

Browse source 
If the connection is in ACTIVATING state, the banner is still NULL.
This commit is contained in:
Lubomir Rintel 2014-11-09 11:36:52 +01:00
parent 9f5cff0bb3
commit 51974196f9
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clients/cli/connections.c
View file

@ -1175,7 +1175,8 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc)
NMSettingConnection *s_con;
NMSettingVpn *s_vpn;
NMVpnConnectionState vpn_state;
char *type_str, *banner_str, *vpn_state_str;
char *type_str, *banner_str = NULL, *vpn_state_str;
const char *banner;
const char *username = NULL;
char **vpn_data_array = NULL;
guint32 items_num;
@ -1208,7 +1209,9 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc)
}
type_str = get_vpn_connection_type (con);
banner_str = g_strescape (nm_vpn_connection_get_banner (NM_VPN_CONNECTION (acon)), "");
banner = nm_vpn_connection_get_banner (NM_VPN_CONNECTION (acon));
if (banner)
banner_str = g_strescape (banner, "");
vpn_state = nm_vpn_connection_get_vpn_state (NM_VPN_CONNECTION (acon));
vpn_state_str = g_strdup_printf ("%d - %s", vpn_state, vpn_connection_state_to_string (vpn_state));