fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-03 19:50:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: check ip-tunnel mode right after it is read

Browse source
This commit is contained in:
Jiří Klimeš 2015-12-16 16:12:24 +01:00
parent 89db31bf7b
commit d0d96c1a13
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
clients/cli/connections.c
View file

@ -6177,14 +6177,6 @@ cleanup_tun:
goto cleanup_tunnel;
}
if (!remote_c && ask)
remote_c = remote_ask = nmc_readline (_("Remote endpoint: "));
if (!remote_c) {
g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
_("Error: 'remote' is required."));
goto cleanup_tunnel;
}
if (!nm_utils_enum_from_str (nm_ip_tunnel_mode_get_type (),
mode_c, (int *) &mode_enum, NULL)) {
gs_free const char **values = NULL;
@ -6200,6 +6192,14 @@ cleanup_tun:
goto cleanup_tunnel;
}
if (!remote_c && ask)
remote_c = remote_ask = nmc_readline (_("Remote endpoint: "));
if (!remote_c) {
g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
_("Error: 'remote' is required."));
goto cleanup_tunnel;
}
if ( !nm_utils_ipaddr_valid (AF_INET, remote_c)
&& !nm_utils_ipaddr_valid (AF_INET6, remote_c)) {
g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,