Update upstream source from tag 'upstream/1.34.0'

Update to upstream version '1.34.0'
with Debian dir b598c27ee9cef517760bc745aa6a3bb7d9fb2ecb

1 files changed, 23 insertions, 22 deletions

diff --git a/src/libnm-core-impl/nm-setting-macsec.c b/src/libnm-core-impl/nm-setting-macsec.c
index 55024bb4..1a9e9bd8 100644
--- a/src/libnm-core-impl/nm-setting-macsec.c
+++ b/src/libnm-core-impl/nm-setting-macsec.c
@@ -45,8 +45,8 @@ typedef struct {
     NMSettingMacsecMode       mode;
     NMSettingSecretFlags      mka_cak_flags;
     NMSettingMacsecValidation validation;
-    bool                      encrypt : 1;
-    bool                      send_sci : 1;
+    bool                      encrypt;
+    bool                      send_sci;
 } NMSettingMacsecPrivate;
 
 /**
@@ -492,9 +492,7 @@ nm_setting_macsec_init(NMSettingMacsec *self)
     NMSettingMacsecPrivate *priv = NM_SETTING_MACSEC_GET_PRIVATE(self);
 
     nm_assert(priv->mode == NM_SETTING_MACSEC_MODE_PSK);
-    priv->encrypt    = TRUE;
     priv->port       = 1;
-    priv->send_sci   = TRUE;
     priv->validation = NM_SETTING_MACSEC_VALIDATION_STRICT;
 }
 
@@ -583,13 +581,14 @@ nm_setting_macsec_class_init(NMSettingMacsecClass *klass)
      *
      * Since: 1.6
      **/
-    _nm_setting_property_define_boolean(properties_override,
-                                        obj_properties,
-                                        NM_SETTING_MACSEC_ENCRYPT,
-                                        PROP_ENCRYPT,
-                                        TRUE,
-                                        NM_SETTING_PARAM_NONE,
-                                        nm_setting_macsec_get_encrypt);
+    _nm_setting_property_define_direct_boolean(properties_override,
+                                               obj_properties,
+                                               NM_SETTING_MACSEC_ENCRYPT,
+                                               PROP_ENCRYPT,
+                                               TRUE,
+                                               NM_SETTING_PARAM_NONE,
+                                               NMSettingMacsecPrivate,
+                                               encrypt);
 
     /**
      * NMSettingMacsec:mka-cak:
@@ -676,18 +675,20 @@ nm_setting_macsec_class_init(NMSettingMacsecClass *klass)
      *
      * Since: 1.12
      **/
-    _nm_setting_property_define_boolean(properties_override,
-                                        obj_properties,
-                                        NM_SETTING_MACSEC_SEND_SCI,
-                                        PROP_SEND_SCI,
-                                        TRUE,
-                                        NM_SETTING_PARAM_NONE,
-                                        nm_setting_macsec_get_send_sci);
+    _nm_setting_property_define_direct_boolean(properties_override,
+                                               obj_properties,
+                                               NM_SETTING_MACSEC_SEND_SCI,
+                                               PROP_SEND_SCI,
+                                               TRUE,
+                                               NM_SETTING_PARAM_NONE,
+                                               NMSettingMacsecPrivate,
+                                               send_sci);
 
     g_object_class_install_properties(object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
-    _nm_setting_class_commit_full(setting_class,
-                                  NM_META_SETTING_TYPE_MACSEC,
-                                  NULL,
-                                  properties_override);
+    _nm_setting_class_commit(setting_class,
+                             NM_META_SETTING_TYPE_MACSEC,
+                             NULL,
+                             properties_override,
+                             NM_SETT_INFO_PRIVATE_OFFSET_FROM_CLASS);
 }