diff options
| author | Michael Biebl <biebl@debian.org> | 2022-08-12 19:27:49 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-08-12 19:27:49 +0200 |
| commit | 3237c6678bee0411e44b2d2055fb16c2f86da218 (patch) | |
| tree | e3d8a0dab846c99fa6132c945ec3bbd59b1cc170 /src/nmcli | |
| parent | b020a0dc29267ec099f631e93f214a0d3549ba40 (diff) | |
| parent | 6accbd3ec0e42d8633bbde4d47ed7bfe854e7e0b (diff) | |
Update upstream source from tag 'upstream/1.38.4'
Update to upstream version '1.38.4' with Debian dir 24b65b102e62687c29d90ce76c47d939b35b96ad
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//\(/\\(}" |