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

cli: sort permission in output of nmcli general permissions

Browse source
This commit is contained in:
Thomas Haller 2019-12-06 11:29:38 +01:00
parent 33754752ea
commit 89d55ad6e1
2 changed files with 733 additions and 734 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
clients/cli/general.c
View file

@ -510,18 +510,17 @@ print_permissions (void *user_data)
NmCli *nmc = user_data;
gs_free_error GError *error = NULL;
const char *fields_str = NULL;
NMClientPermission perm;
guint i;
gpointer permissions[NM_CLIENT_PERMISSION_LAST + 1];
gpointer permissions[G_N_ELEMENTS (nm_auth_permission_sorted) + 1];
int i;
if (!nmc->required_fields || strcasecmp (nmc->required_fields, "common") == 0) {
} else if (strcasecmp (nmc->required_fields, "all") == 0) {
} else
fields_str = nmc->required_fields;
for (i = 0, perm = NM_CLIENT_PERMISSION_NONE + 1; perm <= NM_CLIENT_PERMISSION_LAST; perm++)
permissions[i++] = GINT_TO_POINTER (perm);
permissions[i++] = NULL;
for (i = 0; i < (int) G_N_ELEMENTS (nm_auth_permission_sorted); i++)
permissions[i] = GINT_TO_POINTER (nm_auth_permission_sorted[i]);
permissions[i] = NULL;
nm_cli_spawn_pager (nmc);

1456
clients/tests/test-client.check-on-disk/test_001.expected
View file

File diff suppressed because it is too large Load diff