New upstream version 1.38.0 upstream/1.38.0

3 files changed, 15 insertions, 6 deletions

diff --git a/src/nmcli/connections.c b/src/nmcli/connections.c
index ecf8e2e2..d093823b 100644
--- a/src/nmcli/connections.c
+++ b/src/nmcli/connections.c
@@ -513,8 +513,8 @@ _con_show_fcn_get_type(NMConnection *c, NMActiveConnection *ac, NMMetaAccessorGe
     return connection_type_to_display(s, get_type);
 }
 
-static const char *
-_connection_check_deprecated(NMConnection *c)
+const char *
+nmc_connection_check_deprecated(NMConnection *c)
 {
     NMSettingWirelessSecurity *s_wsec;
     const char                *key_mgmt;
@@ -541,7 +541,7 @@ _connection_to_color(NMConnection *c, NMActiveConnection *ac)
     if (ac)
         return nmc_active_connection_state_to_color(ac);
 
-    if (_connection_check_deprecated(c))
+    if (nmc_connection_check_deprecated(c))
         return NM_META_COLOR_CONNECTION_DEPRECATED;
 
     return NM_META_COLOR_CONNECTION_UNKNOWN;
@@ -1923,7 +1923,8 @@ con_show_get_items_cmp(gconstpointer pa, gconstpointer pb, gpointer user_data)
             }
         }
 
-        NM_CMP_DIRECT(!!_connection_check_deprecated(c_a), !!_connection_check_deprecated(c_b));
+        NM_CMP_DIRECT(!!nmc_connection_check_deprecated(c_a),
+                      !!nmc_connection_check_deprecated(c_b));
         NM_CMP_DIRECT_STRCMP0(nm_connection_get_uuid(c_a), nm_connection_get_uuid(c_b));
         NM_CMP_DIRECT_STRCMP0(nm_connection_get_path(c_a), nm_connection_get_path(c_b));
     }
@@ -5260,7 +5261,7 @@ connection_warnings(NmCli *nmc, NMConnection *connection)
     const char      *id;
     const char      *deprecated;
 
-    deprecated = _connection_check_deprecated(NM_CONNECTION(connection));
+    deprecated = nmc_connection_check_deprecated(NM_CONNECTION(connection));
     if (deprecated)
         g_printerr(_("Warning: %s.\n"), deprecated);
 
diff --git a/src/nmcli/connections.h b/src/nmcli/connections.h
index 782c4eaf..c610766a 100644
--- a/src/nmcli/connections.h
+++ b/src/nmcli/connections.h
@@ -10,6 +10,8 @@
 
 void monitor_connections(NmCli *nmc);
 
+const char *nmc_connection_check_deprecated(NMConnection *c);
+
 gboolean nmc_process_connection_properties(NmCli              *nmc,
                                            NMConnection       *connection,
                                            int                *argc,
diff --git a/src/nmcli/devices.c b/src/nmcli/devices.c
index 2bfc4cec..6fce9de7 100644
--- a/src/nmcli/devices.c
+++ b/src/nmcli/devices.c
@@ -1238,7 +1238,7 @@ compare_aps(gconstpointer a, gconstpointer b, gpointer user_data)
     NMAccessPoint *apb = *(NMAccessPoint **) b;
 
     /* Sort the deprecated WEP connections last. */
-    NM_CMP_DIRECT(_ap_is_wep(apb), _ap_is_wep(apa));
+    NM_CMP_DIRECT(_ap_is_wep(apa), _ap_is_wep(apb));
 
     NM_CMP_DIRECT(nm_access_point_get_strength(apb), nm_access_point_get_strength(apa));
     NM_CMP_DIRECT(nm_access_point_get_frequency(apa), nm_access_point_get_frequency(apb));
@@ -2127,6 +2127,7 @@ add_and_activate_cb(GObject *client, GAsyncResult *result, gpointer user_data)
     NmCli                                                 *nmc    = info->nmc;
     gs_unref_object NMActiveConnection                    *active = NULL;
     gs_free_error GError                                  *error  = NULL;
+    const char                                            *deprecated;
 
     if (info->create)
         active = nm_client_add_and_activate_connection_finish(NM_CLIENT(client), result, &error);
@@ -2152,6 +2153,11 @@ add_and_activate_cb(GObject *client, GAsyncResult *result, gpointer user_data)
         return;
     }
 
+    deprecated =
+        nmc_connection_check_deprecated(NM_CONNECTION(nm_active_connection_get_connection(active)));
+    if (deprecated)
+        g_printerr(_("Warning: %s.\n"), deprecated);
+
     if (nmc->nowait_flag) {
         quit();
         return;