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

make nmcli --ask c u behave as intended

Browse source
This commit is contained in:
Amelia Miner 2024-10-14 11:24:07 +00:00 • committed by Íñigo Huguet
parent 92a2f31531
commit b9d8f6c4da
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/nmcli/connections.c
View file

@ -3143,9 +3143,6 @@ do_connection_up(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const
const char *pwds = NULL;
gs_free_error GError *error = NULL;
gs_strfreev char **arg_arr = NULL;
int arg_num;
const char *const **argv_ptr;
int *argc_ptr;
/*
* Set default timeout for connection activation.
@ -3155,8 +3152,6 @@ do_connection_up(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const
nmc->timeout = 90;
next_arg(nmc, &argc, &argv, NULL);
argv_ptr = &argv;
argc_ptr = &argc;
if (argc == 0 && nmc->ask) {
gs_free char *line = NULL;
@ -3165,13 +3160,12 @@ do_connection_up(const NMCCommand *cmd, NmCli *nmc, int argc, const char *const
g_return_if_fail(!nmc->complete);
line = nmc_readline(&nmc->nmc_config, PROMPT_CONNECTION);
nmc_string_to_arg_array(line, NULL, TRUE, &arg_arr, &arg_num);
argv_ptr = (const char *const **) &arg_arr;
argc_ptr = &arg_num;
nmc_string_to_arg_array(line, NULL, TRUE, &arg_arr, &argc);
argv = (const char *const *) arg_arr;
}
if (argc > 0 && !nm_streq(*argv, "ifname")) {
connection = get_connection(nmc, argc_ptr, argv_ptr, NULL, NULL, NULL, &error);
connection = get_connection(nmc, &argc, &argv, NULL, NULL, NULL, &error);
if (!connection) {
g_string_printf(nmc->return_text, _("Error: %s."), error->message);
nmc->return_value = error->code;