New upstream version 1.27.90 upstream/1.27.90

1 files changed, 142 insertions, 84 deletions

diff --git a/src/nm-audit-manager.h b/src/nm-audit-manager.h
index d8310eaf..65076513 100644
--- a/src/nm-audit-manager.h
+++ b/src/nm-audit-manager.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2015 Red Hat, Inc.
  */
@@ -10,101 +10,159 @@
 #include "devices/nm-device.h"
 #include "nm-types.h"
 
-#define NM_TYPE_AUDIT_MANAGER            (nm_audit_manager_get_type ())
-#define NM_AUDIT_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_AUDIT_MANAGER, NMAuditManager))
-#define NM_AUDIT_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  NM_TYPE_AUDIT_MANAGER, NMAuditManagerClass))
-#define NM_IS_AUDIT_MANAGER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_AUDIT_MANAGER))
-#define NM_IS_AUDIT_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  NM_TYPE_AUDIT_MANAGER))
-#define NM_AUDIT_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  NM_TYPE_AUDIT_MANAGER, NMAuditManagerClass))
+#define NM_TYPE_AUDIT_MANAGER (nm_audit_manager_get_type())
+#define NM_AUDIT_MANAGER(obj) \
+    (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_AUDIT_MANAGER, NMAuditManager))
+#define NM_AUDIT_MANAGER_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_AUDIT_MANAGER, NMAuditManagerClass))
+#define NM_IS_AUDIT_MANAGER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_AUDIT_MANAGER))
+#define NM_IS_AUDIT_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_AUDIT_MANAGER))
+#define NM_AUDIT_MANAGER_GET_CLASS(obj) \
+    (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_AUDIT_MANAGER, NMAuditManagerClass))
 
 typedef struct _NMAuditManagerClass NMAuditManagerClass;
 
-#define NM_AUDIT_OP_CONN_ADD                "connection-add"
-#define NM_AUDIT_OP_CONN_DELETE             "connection-delete"
-#define NM_AUDIT_OP_CONN_UPDATE             "connection-update"
-#define NM_AUDIT_OP_CONN_ACTIVATE           "connection-activate"
-#define NM_AUDIT_OP_CONN_ADD_ACTIVATE       "connection-add-activate"
-#define NM_AUDIT_OP_CONN_DEACTIVATE         "connection-deactivate"
-#define NM_AUDIT_OP_CONN_CLEAR_SECRETS      "connection-clear-secrets"
-
-#define NM_AUDIT_OP_CONNS_RELOAD            "connections-reload"
-#define NM_AUDIT_OP_CONNS_LOAD              "connections-load"
-
-#define NM_AUDIT_OP_RELOAD                  "reload"
-#define NM_AUDIT_OP_SLEEP_CONTROL           "sleep-control"
-#define NM_AUDIT_OP_NET_CONTROL             "networking-control"
-#define NM_AUDIT_OP_RADIO_CONTROL           "radio-control"
-#define NM_AUDIT_OP_STATISTICS              "statistics"
-#define NM_AUDIT_OP_HOSTNAME_SAVE           "hostname-save"
-
-#define NM_AUDIT_OP_DEVICE_AUTOCONNECT      "device-autoconnect"
-#define NM_AUDIT_OP_DEVICE_DISCONNECT       "device-disconnect"
-#define NM_AUDIT_OP_DEVICE_DELETE           "device-delete"
-#define NM_AUDIT_OP_DEVICE_MANAGED          "device-managed"
-#define NM_AUDIT_OP_DEVICE_REAPPLY          "device-reapply"
-
-#define NM_AUDIT_OP_CHECKPOINT_CREATE       "checkpoint-create"
-#define NM_AUDIT_OP_CHECKPOINT_ROLLBACK     "checkpoint-rollback"
-#define NM_AUDIT_OP_CHECKPOINT_DESTROY      "checkpoint-destroy"
+#define NM_AUDIT_OP_CONN_ADD           "connection-add"
+#define NM_AUDIT_OP_CONN_DELETE        "connection-delete"
+#define NM_AUDIT_OP_CONN_UPDATE        "connection-update"
+#define NM_AUDIT_OP_CONN_ACTIVATE      "connection-activate"
+#define NM_AUDIT_OP_CONN_ADD_ACTIVATE  "connection-add-activate"
+#define NM_AUDIT_OP_CONN_DEACTIVATE    "connection-deactivate"
+#define NM_AUDIT_OP_CONN_CLEAR_SECRETS "connection-clear-secrets"
+
+#define NM_AUDIT_OP_CONNS_RELOAD "connections-reload"
+#define NM_AUDIT_OP_CONNS_LOAD   "connections-load"
+
+#define NM_AUDIT_OP_RELOAD        "reload"
+#define NM_AUDIT_OP_SLEEP_CONTROL "sleep-control"
+#define NM_AUDIT_OP_NET_CONTROL   "networking-control"
+#define NM_AUDIT_OP_RADIO_CONTROL "radio-control"
+#define NM_AUDIT_OP_STATISTICS    "statistics"
+#define NM_AUDIT_OP_HOSTNAME_SAVE "hostname-save"
+
+#define NM_AUDIT_OP_DEVICE_AUTOCONNECT "device-autoconnect"
+#define NM_AUDIT_OP_DEVICE_DISCONNECT  "device-disconnect"
+#define NM_AUDIT_OP_DEVICE_DELETE      "device-delete"
+#define NM_AUDIT_OP_DEVICE_MANAGED     "device-managed"
+#define NM_AUDIT_OP_DEVICE_REAPPLY     "device-reapply"
+
+#define NM_AUDIT_OP_CHECKPOINT_CREATE                  "checkpoint-create"
+#define NM_AUDIT_OP_CHECKPOINT_ROLLBACK                "checkpoint-rollback"
+#define NM_AUDIT_OP_CHECKPOINT_DESTROY                 "checkpoint-destroy"
 #define NM_AUDIT_OP_CHECKPOINT_ADJUST_ROLLBACK_TIMEOUT "checkpoint-adjust-rollback-timeout"
 
-GType nm_audit_manager_get_type (void);
-NMAuditManager *nm_audit_manager_get (void);
-gboolean nm_audit_manager_audit_enabled (NMAuditManager *self);
+GType           nm_audit_manager_get_type(void);
+NMAuditManager *nm_audit_manager_get(void);
+gboolean        nm_audit_manager_audit_enabled(NMAuditManager *self);
 
 #define nm_audit_log_connection_op(op, connection, result, args, subject_context, reason) \
-	G_STMT_START { \
-		NMAuditManager *_audit = nm_audit_manager_get (); \
-		\
-		if (nm_audit_manager_audit_enabled (_audit)) { \
-			_nm_audit_manager_log_connection_op (_audit, __FILE__, __LINE__, G_STRFUNC, \
-			                                     (op), (connection), (result), (args), (subject_context), \
-			                                     (reason)); \
-		} \
-	} G_STMT_END
+    G_STMT_START                                                                          \
+    {                                                                                     \
+        NMAuditManager *_audit = nm_audit_manager_get();                                  \
+                                                                                          \
+        if (nm_audit_manager_audit_enabled(_audit)) {                                     \
+            _nm_audit_manager_log_connection_op(_audit,                                   \
+                                                __FILE__,                                 \
+                                                __LINE__,                                 \
+                                                G_STRFUNC,                                \
+                                                (op),                                     \
+                                                (connection),                             \
+                                                (result),                                 \
+                                                (args),                                   \
+                                                (subject_context),                        \
+                                                (reason));                                \
+        }                                                                                 \
+    }                                                                                     \
+    G_STMT_END
 
 #define nm_audit_log_control_op(op, arg, result, subject_context, reason) \
-	G_STMT_START { \
-		NMAuditManager *_audit = nm_audit_manager_get (); \
-		\
-		if (nm_audit_manager_audit_enabled (_audit)) { \
-			_nm_audit_manager_log_generic_op (_audit, __FILE__, __LINE__, G_STRFUNC, \
-			                                  (op), (arg), (result), (subject_context), (reason)); \
-		} \
-	} G_STMT_END
+    G_STMT_START                                                          \
+    {                                                                     \
+        NMAuditManager *_audit = nm_audit_manager_get();                  \
+                                                                          \
+        if (nm_audit_manager_audit_enabled(_audit)) {                     \
+            _nm_audit_manager_log_generic_op(_audit,                      \
+                                             __FILE__,                    \
+                                             __LINE__,                    \
+                                             G_STRFUNC,                   \
+                                             (op),                        \
+                                             (arg),                       \
+                                             (result),                    \
+                                             (subject_context),           \
+                                             (reason));                   \
+        }                                                                 \
+    }                                                                     \
+    G_STMT_END
 
 #define nm_audit_log_device_op(op, device, result, args, subject_context, reason) \
-	G_STMT_START { \
-		NMAuditManager *_audit = nm_audit_manager_get (); \
-		\
-		if (nm_audit_manager_audit_enabled (_audit)) { \
-			_nm_audit_manager_log_device_op (_audit, __FILE__, __LINE__, G_STRFUNC, \
-			                                 (op), (device), (result), (args), (subject_context), (reason)); \
-		} \
-	} G_STMT_END
+    G_STMT_START                                                                  \
+    {                                                                             \
+        NMAuditManager *_audit = nm_audit_manager_get();                          \
+                                                                                  \
+        if (nm_audit_manager_audit_enabled(_audit)) {                             \
+            _nm_audit_manager_log_device_op(_audit,                               \
+                                            __FILE__,                             \
+                                            __LINE__,                             \
+                                            G_STRFUNC,                            \
+                                            (op),                                 \
+                                            (device),                             \
+                                            (result),                             \
+                                            (args),                               \
+                                            (subject_context),                    \
+                                            (reason));                            \
+        }                                                                         \
+    }                                                                             \
+    G_STMT_END
 
 #define nm_audit_log_checkpoint_op(op, arg, result, subject_context, reason) \
-	G_STMT_START { \
-		NMAuditManager *_audit = nm_audit_manager_get (); \
-		\
-		if (nm_audit_manager_audit_enabled (_audit)) { \
-			_nm_audit_manager_log_generic_op (_audit, __FILE__, __LINE__, G_STRFUNC, \
-			                                  (op), (arg), (result), (subject_context), (reason)); \
-		} \
-	} G_STMT_END
-
-void _nm_audit_manager_log_connection_op (NMAuditManager *self, const char *file, guint line,
-                                          const char *func, const char *op, NMSettingsConnection *connection,
-                                          gboolean result, const char *args, gpointer subject_context,
-                                          const char *reason);
-
-void _nm_audit_manager_log_generic_op    (NMAuditManager *self, const char *file, guint line,
-                                          const char *func, const char *op, const char *arg,
-                                          gboolean result, gpointer subject_context, const char *reason);
-
-void _nm_audit_manager_log_device_op     (NMAuditManager *self, const char *file, guint line,
-                                          const char *func, const char *op, NMDevice *device,
-                                          gboolean result, const char *args, gpointer subject_context,
-                                          const char *reason);
+    G_STMT_START                                                             \
+    {                                                                        \
+        NMAuditManager *_audit = nm_audit_manager_get();                     \
+                                                                             \
+        if (nm_audit_manager_audit_enabled(_audit)) {                        \
+            _nm_audit_manager_log_generic_op(_audit,                         \
+                                             __FILE__,                       \
+                                             __LINE__,                       \
+                                             G_STRFUNC,                      \
+                                             (op),                           \
+                                             (arg),                          \
+                                             (result),                       \
+                                             (subject_context),              \
+                                             (reason));                      \
+        }                                                                    \
+    }                                                                        \
+    G_STMT_END
+
+void _nm_audit_manager_log_connection_op(NMAuditManager *      self,
+                                         const char *          file,
+                                         guint                 line,
+                                         const char *          func,
+                                         const char *          op,
+                                         NMSettingsConnection *connection,
+                                         gboolean              result,
+                                         const char *          args,
+                                         gpointer              subject_context,
+                                         const char *          reason);
+
+void _nm_audit_manager_log_generic_op(NMAuditManager *self,
+                                      const char *    file,
+                                      guint           line,
+                                      const char *    func,
+                                      const char *    op,
+                                      const char *    arg,
+                                      gboolean        result,
+                                      gpointer        subject_context,
+                                      const char *    reason);
+
+void _nm_audit_manager_log_device_op(NMAuditManager *self,
+                                     const char *    file,
+                                     guint           line,
+                                     const char *    func,
+                                     const char *    op,
+                                     NMDevice *      device,
+                                     gboolean        result,
+                                     const char *    args,
+                                     gpointer        subject_context,
+                                     const char *    reason);
 
 #endif /* __NM_AUDIT_MANAGER_H__ */