diff options
| author | Michael Biebl <biebl@debian.org> | 2022-08-13 16:40:06 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-08-13 16:40:06 +0200 |
| commit | 38ca7ae9c3556e9a5b50ee15015ea194e6ca8da1 (patch) | |
| tree | 99f19f118f550362c3288e7b82a7aab3a75c8d64 /src/nmcli | |
| parent | c2473cb3f165975f2899ccef11f036c9762a8aa3 (diff) | |
| parent | 49ac65f875a36d7ebcbc8270cf0fc60acbb2e052 (diff) | |
Merge tag 'debian/1.38.4-1' into debian/bullseye-backports
network-manager Debian release 1.38.4-1
Diffstat (limited to 'src/nmcli')
| -rw-r--r-- | src/nmcli/devices.c | 5 | ||||
| -rw-r--r-- | src/nmcli/nmcli-completion | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/nmcli/devices.c b/src/nmcli/devices.c index 6fce9de7..be51731f 100644 --- a/src/nmcli/devices.c +++ b/src/nmcli/devices.c @@ -1343,9 +1343,10 @@ fill_output_access_point(NMAccessPoint *ap, const APInfo *info) if (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_SAE) { g_string_append(security_str, "WPA3 "); } - if (NM_FLAGS_ANY(rsn_flags, - NM_802_11_AP_SEC_KEY_MGMT_OWE | NM_802_11_AP_SEC_KEY_MGMT_OWE_TM)) { + if (NM_FLAGS_ANY(rsn_flags, NM_802_11_AP_SEC_KEY_MGMT_OWE)) { g_string_append(security_str, "OWE "); + } else if (NM_FLAGS_ANY(rsn_flags, NM_802_11_AP_SEC_KEY_MGMT_OWE_TM)) { + g_string_append(security_str, "OWE-TM "); } if ((wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X) || (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) { diff --git a/src/nmcli/nmcli-completion b/src/nmcli/nmcli-completion index 83ec1e3c..f2de7b67 100644 --- a/src/nmcli/nmcli-completion +++ b/src/nmcli/nmcli-completion @@ -84,7 +84,7 @@ _nmcli() # no quotes in front, escaping _everything_ # [ ]bla'bla"bla\bla bla --> [ ]bla\'bla\"bla\\bla\ bla entry="${entry//\\/\\\\}" - entry="${entry//\'/\'}" + entry="${entry//\'/\\\'}" entry="${entry//\"/\\\"}" entry="${entry// /\\ }" entry="${entry//\(/\\(}" |