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

nmcli: fix "nmcli device monitor <dev>"

Browse Source 
Call get_device_list() after next_arg(); call it only after checking
that there are other arguments after "monitor".

Fixes: 6a3d77fbe6
This commit is contained in:
Francesco Giudici
2017-04-11 15:39:08 +02:00
parent b35e10f0ed
commit 2c4e991aba
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
clients/cli/devices.c
View File

@@ -2417,9 +2417,6 @@ device_removed (NMClient *client, NMDevice *device, NmCli *nmc)
static NMCResultCode static NMCResultCode
do_devices_monitor (NmCli *nmc, int argc, char **argv) do_devices_monitor (NmCli *nmc, int argc, char **argv)
{ {
GSList *queue = get_device_list (nmc, argc, argv);
GSList *iter;
if (nmc->complete) if (nmc->complete)
return nmc->return_value; return nmc->return_value;
@@ -2436,6 +2433,9 @@ do_devices_monitor (NmCli *nmc, int argc, char **argv)
nmc->should_wait++; nmc->should_wait++;
g_signal_connect (nmc->client, NM_CLIENT_DEVICE_ADDED, G_CALLBACK (device_added), nmc); g_signal_connect (nmc->client, NM_CLIENT_DEVICE_ADDED, G_CALLBACK (device_added), nmc);
} else { } else {
GSList *queue = get_device_list (nmc, argc, argv);
GSList *iter;
/* Monitor the specified devices. */ /* Monitor the specified devices. */
for (iter = queue; iter; iter = g_slist_next (iter)) for (iter = queue; iter; iter = g_slist_next (iter))
device_watch (nmc, NM_DEVICE (iter->data)); device_watch (nmc, NM_DEVICE (iter->data));