New upstream version 1.27.90 upstream/1.27.90

1 files changed, 43 insertions, 39 deletions

diff --git a/libnm-core/nm-libnm-core-intern/nm-common-macros.h b/libnm-core/nm-libnm-core-intern/nm-common-macros.h
index fcfe6919..9de3a8fc 100644
--- a/libnm-core/nm-libnm-core-intern/nm-common-macros.h
+++ b/libnm-core/nm-libnm-core-intern/nm-common-macros.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /*
  * Copyright (C) 2016 Red Hat, Inc.
  */
@@ -8,54 +8,58 @@
 
 /*****************************************************************************/
 
-#define NM_AUTH_PERMISSION_ENABLE_DISABLE_NETWORK     "org.freedesktop.NetworkManager.enable-disable-network"
-#define NM_AUTH_PERMISSION_SLEEP_WAKE                 "org.freedesktop.NetworkManager.sleep-wake"
-#define NM_AUTH_PERMISSION_ENABLE_DISABLE_WIFI        "org.freedesktop.NetworkManager.enable-disable-wifi"
-#define NM_AUTH_PERMISSION_ENABLE_DISABLE_WWAN        "org.freedesktop.NetworkManager.enable-disable-wwan"
-#define NM_AUTH_PERMISSION_ENABLE_DISABLE_WIMAX       "org.freedesktop.NetworkManager.enable-disable-wimax"
-#define NM_AUTH_PERMISSION_NETWORK_CONTROL            "org.freedesktop.NetworkManager.network-control"
-#define NM_AUTH_PERMISSION_WIFI_SHARE_PROTECTED       "org.freedesktop.NetworkManager.wifi.share.protected"
-#define NM_AUTH_PERMISSION_WIFI_SHARE_OPEN            "org.freedesktop.NetworkManager.wifi.share.open"
-#define NM_AUTH_PERMISSION_SETTINGS_MODIFY_SYSTEM     "org.freedesktop.NetworkManager.settings.modify.system"
-#define NM_AUTH_PERMISSION_SETTINGS_MODIFY_OWN        "org.freedesktop.NetworkManager.settings.modify.own"
-#define NM_AUTH_PERMISSION_SETTINGS_MODIFY_HOSTNAME   "org.freedesktop.NetworkManager.settings.modify.hostname"
-#define NM_AUTH_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS "org.freedesktop.NetworkManager.settings.modify.global-dns"
-#define NM_AUTH_PERMISSION_RELOAD                     "org.freedesktop.NetworkManager.reload"
-#define NM_AUTH_PERMISSION_CHECKPOINT_ROLLBACK        "org.freedesktop.NetworkManager.checkpoint-rollback"
-#define NM_AUTH_PERMISSION_ENABLE_DISABLE_STATISTICS  "org.freedesktop.NetworkManager.enable-disable-statistics"
-#define NM_AUTH_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK "org.freedesktop.NetworkManager.enable-disable-connectivity-check"
-#define NM_AUTH_PERMISSION_WIFI_SCAN                  "org.freedesktop.NetworkManager.wifi.scan"
-
-#define NM_CLONED_MAC_PRESERVE                          "preserve"
-#define NM_CLONED_MAC_PERMANENT                         "permanent"
-#define NM_CLONED_MAC_RANDOM                            "random"
-#define NM_CLONED_MAC_STABLE                            "stable"
+#define NM_AUTH_PERMISSION_ENABLE_DISABLE_NETWORK \
+    "org.freedesktop.NetworkManager.enable-disable-network"
+#define NM_AUTH_PERMISSION_SLEEP_WAKE          "org.freedesktop.NetworkManager.sleep-wake"
+#define NM_AUTH_PERMISSION_ENABLE_DISABLE_WIFI "org.freedesktop.NetworkManager.enable-disable-wifi"
+#define NM_AUTH_PERMISSION_ENABLE_DISABLE_WWAN "org.freedesktop.NetworkManager.enable-disable-wwan"
+#define NM_AUTH_PERMISSION_ENABLE_DISABLE_WIMAX \
+    "org.freedesktop.NetworkManager.enable-disable-wimax"
+#define NM_AUTH_PERMISSION_NETWORK_CONTROL "org.freedesktop.NetworkManager.network-control"
+#define NM_AUTH_PERMISSION_WIFI_SHARE_PROTECTED \
+    "org.freedesktop.NetworkManager.wifi.share.protected"
+#define NM_AUTH_PERMISSION_WIFI_SHARE_OPEN "org.freedesktop.NetworkManager.wifi.share.open"
+#define NM_AUTH_PERMISSION_SETTINGS_MODIFY_SYSTEM \
+    "org.freedesktop.NetworkManager.settings.modify.system"
+#define NM_AUTH_PERMISSION_SETTINGS_MODIFY_OWN "org.freedesktop.NetworkManager.settings.modify.own"
+#define NM_AUTH_PERMISSION_SETTINGS_MODIFY_HOSTNAME \
+    "org.freedesktop.NetworkManager.settings.modify.hostname"
+#define NM_AUTH_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS \
+    "org.freedesktop.NetworkManager.settings.modify.global-dns"
+#define NM_AUTH_PERMISSION_RELOAD              "org.freedesktop.NetworkManager.reload"
+#define NM_AUTH_PERMISSION_CHECKPOINT_ROLLBACK "org.freedesktop.NetworkManager.checkpoint-rollback"
+#define NM_AUTH_PERMISSION_ENABLE_DISABLE_STATISTICS \
+    "org.freedesktop.NetworkManager.enable-disable-statistics"
+#define NM_AUTH_PERMISSION_ENABLE_DISABLE_CONNECTIVITY_CHECK \
+    "org.freedesktop.NetworkManager.enable-disable-connectivity-check"
+#define NM_AUTH_PERMISSION_WIFI_SCAN "org.freedesktop.NetworkManager.wifi.scan"
+
+#define NM_CLONED_MAC_PRESERVE  "preserve"
+#define NM_CLONED_MAC_PERMANENT "permanent"
+#define NM_CLONED_MAC_RANDOM    "random"
+#define NM_CLONED_MAC_STABLE    "stable"
 
 static inline gboolean
-NM_CLONED_MAC_IS_SPECIAL (const char *str)
+NM_CLONED_MAC_IS_SPECIAL(const char *str)
 {
-	return NM_IN_STRSET (str,
-	                     NM_CLONED_MAC_PRESERVE,
-	                     NM_CLONED_MAC_PERMANENT,
-	                     NM_CLONED_MAC_RANDOM,
-	                     NM_CLONED_MAC_STABLE);
+    return NM_IN_STRSET(str,
+                        NM_CLONED_MAC_PRESERVE,
+                        NM_CLONED_MAC_PERMANENT,
+                        NM_CLONED_MAC_RANDOM,
+                        NM_CLONED_MAC_STABLE);
 }
 
-#define NM_IAID_MAC                "mac"
-#define NM_IAID_PERM_MAC           "perm-mac"
-#define NM_IAID_IFNAME             "ifname"
-#define NM_IAID_STABLE             "stable"
+#define NM_IAID_MAC      "mac"
+#define NM_IAID_PERM_MAC "perm-mac"
+#define NM_IAID_IFNAME   "ifname"
+#define NM_IAID_STABLE   "stable"
 
 #define NM_CONNECTION_MUD_URL_NONE "none"
 
 static inline gboolean
-NM_IAID_IS_SPECIAL (const char *str)
+NM_IAID_IS_SPECIAL(const char *str)
 {
-	return NM_IN_STRSET (str,
-	                     NM_IAID_MAC,
-	                     NM_IAID_PERM_MAC,
-	                     NM_IAID_IFNAME,
-	                     NM_IAID_STABLE);
+    return NM_IN_STRSET(str, NM_IAID_MAC, NM_IAID_PERM_MAC, NM_IAID_IFNAME, NM_IAID_STABLE);
 }
 
 #endif /* __NM_COMMON_MACROS_H__ */