Update upstream source from tag 'upstream/1.32.12'

Update to upstream version '1.32.12'
with Debian dir 6fabefa95c7dcf83371a78eb2c47013a81ff8d86

1 files changed, 18 insertions, 16 deletions

diff --git a/src/core/nm-act-request.c b/src/core/nm-act-request.c
index defe3e8c..d0a2e0c7 100644
--- a/src/core/nm-act-request.c
+++ b/src/core/nm-act-request.c
@@ -13,17 +13,19 @@
 #include <unistd.h>
 
 #include "c-list/src/c-list.h"
+#include "libnm-core-aux-intern/nm-auth-subject.h"
 
-#include "nm-setting-wireless-security.h"
 #include "nm-setting-8021x.h"
+#include "nm-setting-wireless-security.h"
+
 #include "devices/nm-device.h"
 #include "nm-active-connection.h"
+#include "nm-firewall-utils.h"
 #include "settings/nm-settings-connection.h"
-#include "nm-libnm-core-intern/nm-auth-subject.h"
 
 typedef struct {
-    CList              call_ids_lst_head;
-    NMUtilsShareRules *share_rules;
+    CList             call_ids_lst_head;
+    NMFirewallConfig *firewall_config;
 } NMActRequestPrivate;
 
 struct _NMActRequest {
@@ -248,31 +250,31 @@ nm_act_request_clear_secrets(NMActRequest *self)
 
 /*****************************************************************************/
 
-NMUtilsShareRules *
+NMFirewallConfig *
 nm_act_request_get_shared(NMActRequest *req)
 {
     g_return_val_if_fail(NM_IS_ACT_REQUEST(req), FALSE);
 
-    return NM_ACT_REQUEST_GET_PRIVATE(req)->share_rules;
+    return NM_ACT_REQUEST_GET_PRIVATE(req)->firewall_config;
 }
 
 void
-nm_act_request_set_shared(NMActRequest *req, NMUtilsShareRules *rules)
+nm_act_request_set_shared(NMActRequest *req, NMFirewallConfig *rules)
 {
     NMActRequestPrivate *priv = NM_ACT_REQUEST_GET_PRIVATE(req);
 
     g_return_if_fail(NM_IS_ACT_REQUEST(req));
 
-    if (priv->share_rules == rules)
+    if (priv->firewall_config == rules)
         return;
 
-    if (priv->share_rules) {
-        nm_utils_share_rules_apply(priv->share_rules, FALSE);
-        priv->share_rules = NULL;
+    if (priv->firewall_config) {
+        nm_firewall_config_apply(priv->firewall_config, FALSE);
+        priv->firewall_config = NULL;
     }
     if (rules) {
-        priv->share_rules = rules;
-        nm_utils_share_rules_apply(priv->share_rules, TRUE);
+        priv->firewall_config = rules;
+        nm_firewall_config_apply(priv->firewall_config, TRUE);
     }
 }
 
@@ -506,9 +508,9 @@ dispose(GObject *object)
     c_list_for_each_entry_safe (call_id, call_id_safe, &priv->call_ids_lst_head, call_ids_lst)
         _do_cancel_secrets(self, call_id, TRUE);
 
-    if (priv->share_rules) {
-        nm_utils_share_rules_apply(priv->share_rules, FALSE);
-        nm_clear_pointer(&priv->share_rules, nm_utils_share_rules_free);
+    if (priv->firewall_config) {
+        nm_firewall_config_apply(priv->firewall_config, FALSE);
+        nm_clear_pointer(&priv->firewall_config, nm_firewall_config_free);
     }
 
     G_OBJECT_CLASS(nm_act_request_parent_class)->dispose(object);