From 7bf05b7fa5196d25d5b98cea271e00cb722a30a2 Mon Sep 17 00:00:00 2001
From: Fernando Fernandez Mancera <ffmancera@riseup.net>
Date: Sun, 4 Aug 2024 23:52:44 +0200
Subject: [PATCH] config: parse autoconnect-ports value on config

As part of the conscious language effort we must provide an alternative
option to configure autoconnect-ports system-wide on NetworkManager
configuration file.

(cherry picked from commit ad68b2884331e8f3fffba309ef009a4602ffdfe9)
---
 man/NetworkManager.conf.xml |  5 +++++
 src/core/nm-manager.c       | 12 +++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 5401fec12c..4c49065708 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -857,8 +857,13 @@ ipv6.ip6-privacy=0
           <listitem><para>If left unspecified, the default value is 3 tries before failing the connection.
           </para></listitem>
         </varlistentry>
+        <varlistentry>
+          <term><varname>connection.autoconnect-ports</varname></term>
+        </varlistentry>
         <varlistentry>
           <term><varname>connection.autoconnect-slaves</varname></term>
+          <listitem><para>This is deprecated, please use "connection.autoconnect-ports" instead.
+          </para></listitem>
         </varlistentry>
         <varlistentry>
           <term><varname>connection.down-on-poweroff</varname></term>
diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
index 21da89c89e..0a7e7b2e4a 100644
--- a/src/core/nm-manager.c
+++ b/src/core/nm-manager.c
@@ -5375,12 +5375,22 @@ should_connect_ports(NMConnection *connection, NMDevice *device)
 
     val =
         nm_config_data_get_connection_default_int64(NM_CONFIG_GET_DATA,
-                                                    NM_CON_DEFAULT("connection.autoconnect-slaves"),
+                                                    NM_CON_DEFAULT("connection.autoconnect-ports"),
                                                     device,
                                                     0,
                                                     1,
                                                     -1);
 
+    /* Trust "connection.autoconnect-ports" first, if set to default fallback to the deprecated term. */
+    if (val == NM_TERNARY_DEFAULT)
+        val = nm_config_data_get_connection_default_int64(
+            NM_CONFIG_GET_DATA,
+            NM_CON_DEFAULT("connection.autoconnect-slaves"),
+            device,
+            0,
+            1,
+            -1);
+
 out:
     if (val == NM_TERNARY_FALSE)
         return FALSE;