Update upstream source from tag 'upstream/1.27.91'

Update to upstream version '1.27.91'
with Debian dir 00b16bc3e33f8058a60e79863d76fe240a94309d

1 files changed, 21 insertions, 0 deletions

diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
index bd250875..407aa1d6 100644
--- a/src/nm-ip6-config.c
+++ b/src/nm-ip6-config.c
@@ -64,6 +64,7 @@ typedef struct {
         NMDedupMultiIdxType         idx_ip6_routes;
     };
     NMIPConfigFlags config_flags;
+    bool            never_default : 1;
 } NMIP6ConfigPrivate;
 
 struct _NMIP6Config {
@@ -128,6 +129,24 @@ nm_ip6_config_set_privacy(NMIP6Config *self, NMSettingIP6ConfigPrivacy privacy)
 
 /*****************************************************************************/
 
+void
+nm_ip6_config_set_never_default(NMIP6Config *self, gboolean never_default)
+{
+    NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE(self);
+
+    priv->never_default = never_default;
+}
+
+gboolean
+nm_ip6_config_get_never_default(const NMIP6Config *self)
+{
+    const NMIP6ConfigPrivate *priv = NM_IP6_CONFIG_GET_PRIVATE(self);
+
+    return priv->never_default;
+}
+
+/*****************************************************************************/
+
 const NMDedupMultiHeadEntry *
 nm_ip6_config_lookup_addresses(const NMIP6Config *self)
 {
@@ -635,6 +654,8 @@ nm_ip6_config_merge_setting(NMIP6Config *      self,
     if (priority)
         nm_ip6_config_set_dns_priority(self, priority);
 
+    nm_ip6_config_set_never_default(self, nm_setting_ip_config_get_never_default(setting));
+
     g_object_thaw_notify(G_OBJECT(self));
 }