Update upstream source from tag 'upstream/1.11.4'

Update to upstream version '1.11.4'
with Debian dir d0638aa2e32d5bae4e8daa021b9a66b7c4d6647e

40 files changed, 21 insertions, 83 deletions

diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h
index 5e1c3f9f..2aa2e357 100644
--- a/libnm-util/NetworkManager.h
+++ b/libnm-util/NetworkManager.h
@@ -66,7 +66,6 @@
 #define NM_DBUS_INTERFACE_DEVICE_VXLAN      NM_DBUS_INTERFACE_DEVICE ".Vxlan"
 #define NM_DBUS_INTERFACE_DEVICE_GRE        NM_DBUS_INTERFACE_DEVICE ".Gre"
 
-
 #define NM_DBUS_IFACE_SETTINGS            "org.freedesktop.NetworkManager.Settings"
 #define NM_DBUS_PATH_SETTINGS             "/org/freedesktop/NetworkManager/Settings"
 
@@ -196,7 +195,6 @@ typedef enum { /*< flags >*/
 	NM_DEVICE_CAP_IS_SOFTWARE    = 0x00000004,
 } NMDeviceCapabilities;
 
-
 /**
  * NMDeviceWifiCapabilities:
  * @NM_WIFI_DEVICE_CAP_NONE: device has no encryption/authentication capabilities
@@ -229,7 +227,6 @@ typedef enum { /*< flags >*/
 	NM_WIFI_DEVICE_CAP_FREQ_5GHZ     = 0x00000400,
 } NMDeviceWifiCapabilities;
 
-
 /**
  * NM80211ApFlags:
  * @NM_802_11_AP_FLAGS_NONE: access point has no special capabilities
@@ -343,7 +340,6 @@ typedef enum { /*< flags >*/
 	NM_DEVICE_MODEM_CAPABILITY_LTE       = 0x00000008,
 } NMDeviceModemCapabilities;
 
-
 /**
  * NMDeviceState:
  * @NM_DEVICE_STATE_UNKNOWN: the device's state is unknown
@@ -398,7 +394,6 @@ typedef enum {
 	NM_DEVICE_STATE_FAILED       = 120,
 } NMDeviceState;
 
-
 /**
  * NMDeviceStateReason:
  * @NM_DEVICE_STATE_REASON_NONE: No reason given
@@ -535,7 +530,6 @@ typedef enum {
 	NM_DEVICE_STATE_REASON_LAST                           = 0xFFFF,
 } NMDeviceStateReason;
 
-
 /**
  * NMActiveConnectionState:
  * @NM_ACTIVE_CONNECTION_STATE_UNKNOWN: the state of the connection is unknown
diff --git a/libnm-util/NetworkManagerVPN.h b/libnm-util/NetworkManagerVPN.h
index 75661986..39a5d961 100644
--- a/libnm-util/NetworkManagerVPN.h
+++ b/libnm-util/NetworkManagerVPN.h
@@ -54,7 +54,6 @@
 #define NM_DBUS_VPN_BAD_ARGUMENTS             "BadArguments"
 #define NM_DBUS_VPN_INTERACTIVE_NOT_SUPPORTED "InteractiveNotSupported"
 
-
 /*
  * VPN daemon signals
  */
@@ -89,7 +88,6 @@ typedef enum NMVPNServiceState {
 	NM_VPN_SERVICE_STATE_STOPPED
 } NMVPNServiceState;
 
-
 /**
  * NMVPNConnectionState:
  * @NM_VPN_CONNECTION_STATE_UNKNOWN: The state of the VPN connection is
@@ -177,7 +175,6 @@ typedef enum {
 	NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG
 } NMVPNPluginFailure;
 
-
 /*** Generic config ***/
 
 /* string: VPN interface name (tun0, tap0, etc) */
@@ -203,7 +200,6 @@ typedef enum {
  */
 #define NM_VPN_PLUGIN_CAN_PERSIST        "can-persist"
 
-
 /*** Ip4Config ***/
 
 /* uint32: IP address of the internal gateway of the subnet the VPN interface is
@@ -257,7 +253,6 @@ typedef enum {
 #define NM_VPN_PLUGIN_IP4_CONFIG_MTU         NM_VPN_PLUGIN_CONFIG_MTU
 #define NM_VPN_PLUGIN_IP4_CONFIG_TUNDEV      NM_VPN_PLUGIN_CONFIG_TUNDEV
 
-
 /*** Ip6Config ***/
 
 /* array of uint8: IP address of the internal gateway of the subnet the VPN interface is
diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c
index 9778edeb..5d1a37ff 100644
--- a/libnm-util/crypto.c
+++ b/libnm-util/crypto.c
@@ -40,7 +40,6 @@ _nm_crypto_error_quark (void)
 	return quark;
 }
 
-
 #define PEM_RSA_KEY_BEGIN "-----BEGIN RSA PRIVATE KEY-----"
 #define PEM_RSA_KEY_END   "-----END RSA PRIVATE KEY-----"
 
diff --git a/libnm-util/crypto_gnutls.c b/libnm-util/crypto_gnutls.c
index 8604c5c3..47c614b9 100644
--- a/libnm-util/crypto_gnutls.c
+++ b/libnm-util/crypto_gnutls.c
@@ -242,15 +242,12 @@ crypto_encrypt (const char *cipher,
 	gsize padded_buf_len, pad_len, output_len;
 	char *padded_buf = NULL;
 	guint32 i;
-	gsize salt_len;
 
-	if (!strcmp (cipher, CIPHER_DES_EDE3_CBC)) {
+	if (!strcmp (cipher, CIPHER_DES_EDE3_CBC))
 		cipher_mech = GNUTLS_CIPHER_3DES_CBC;
-		salt_len = SALT_LEN;
-	} else if (!strcmp (cipher, CIPHER_AES_CBC)) {
+	else if (!strcmp (cipher, CIPHER_AES_CBC))
 		cipher_mech = GNUTLS_CIPHER_AES_128_CBC;
-		salt_len = iv_len;
-	} else {
+	else {
 		g_set_error (error, NM_CRYPTO_ERROR,
 		             NM_CRYPTO_ERR_UNKNOWN_CIPHER,
 		             _("Private key cipher '%s' was unknown."),
diff --git a/libnm-util/meson.build b/libnm-util/meson.build
index b385e32b..55df5501 100644
--- a/libnm-util/meson.build
+++ b/libnm-util/meson.build
@@ -55,7 +55,7 @@ libnm_utils_enum = gnome.mkenums(
   install_dir: nm_pkgincludedir
 )
 
-sources = shared_utils + files(
+sources = files(
   'crypto.c',
   'crypto_' + crypto + '.c',
   'nm-connection.c',
@@ -90,6 +90,7 @@ sources = shared_utils + files(
   'nm-utils.c',
   'nm-value-transforms.c'
 )
+sources += shared_files_libnm_util
 
 deps = [
   crypto_dep,
@@ -101,7 +102,7 @@ deps = [
 
 common_cflags = [
   '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL',
-  '-DLOCALEDIR="@0@"'.format(nm_localedir),
+  '-DNMLOCALEDIR="@0@"'.format(nm_localedir),
 ]
 
 cflags = common_cflags + [
diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c
index b929fdcd..3ddea2d7 100644
--- a/libnm-util/nm-connection.c
+++ b/libnm-util/nm-connection.c
@@ -120,10 +120,8 @@ enum {
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-
 static NMSettingVerifyResult _nm_connection_verify (NMConnection *connection, GError **error);
 
-
 /*****************************************************************************/
 
 /**
@@ -493,7 +491,6 @@ nm_connection_compare (NMConnection *a,
 	return TRUE;
 }
 
-
 static void
 diff_one_connection (NMConnection *a,
                      NMConnection *b,
@@ -1023,7 +1020,7 @@ nm_connection_update_secrets (NMConnection *connection,
 
 		g_signal_handlers_block_by_func (setting, (GCallback) setting_changed_cb, connection);
 		success_detail = _nm_setting_update_secrets (setting,
-		                                             setting_hash ? setting_hash : secrets,
+		                                             setting_hash ?: secrets,
 		                                             error);
 		g_signal_handlers_unblock_by_func (setting, (GCallback) setting_changed_cb, connection);
 
diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index 5cb19818..ae7a47e6 100644
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -1342,7 +1342,6 @@ nm_setting_802_1x_remove_phase2_altsubject_match (NMSetting8021x *setting, guint
 	g_object_notify (G_OBJECT (setting), NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES);
 }
 
-
 /**
  * nm_setting_802_1x_remove_phase2_altsubject_match_by_value:
  * @setting: the #NMSetting8021x
@@ -2535,7 +2534,6 @@ static void need_secrets_phase2 (NMSetting8021x *self,
                                  GPtrArray *secrets,
                                  gboolean phase2);
 
-
 typedef void (*EAPMethodNeedSecretsFunc) (NMSetting8021x *self,
                                           GPtrArray *secrets,
                                           gboolean phase2);
@@ -2601,7 +2599,6 @@ need_secrets_phase2 (NMSetting8021x *self,
 	}
 }
 
-
 static GPtrArray *
 need_secrets (NMSetting *setting)
 {
diff --git a/libnm-util/nm-setting-8021x.h b/libnm-util/nm-setting-8021x.h
index 3de8f4c3..b3e1e540 100644
--- a/libnm-util/nm-setting-8021x.h
+++ b/libnm-util/nm-setting-8021x.h
@@ -65,7 +65,6 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_ck_scheme >*/
 	NM_SETTING_802_1X_CK_SCHEME_PATH
 } NMSetting8021xCKScheme;
 
-
 #define NM_TYPE_SETTING_802_1X            (nm_setting_802_1x_get_type ())
 #define NM_SETTING_802_1X(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_802_1X, NMSetting8021x))
 #define NM_SETTING_802_1X_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_802_1X, NMSetting8021xClass))
@@ -91,7 +90,6 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_error >*/
 #define NM_SETTING_802_1X_ERROR nm_setting_802_1x_error_quark ()
 GQuark nm_setting_802_1x_error_quark (void);
 
-
 #define NM_SETTING_802_1X_EAP "eap"
 #define NM_SETTING_802_1X_IDENTITY "identity"
 #define NM_SETTING_802_1X_ANONYMOUS_IDENTITY "anonymous-identity"
@@ -291,7 +289,6 @@ NMSettingSecretFlags   nm_setting_802_1x_get_phase2_private_key_password_flags (
 
 NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format   (NMSetting8021x *setting);
 
-
 G_END_DECLS
 
 #endif /* NM_SETTING_8021X_H */
diff --git a/libnm-util/nm-setting-adsl.c b/libnm-util/nm-setting-adsl.c
index 5c177570..f2305b38 100644
--- a/libnm-util/nm-setting-adsl.c
+++ b/libnm-util/nm-setting-adsl.c
@@ -226,7 +226,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 		             NM_SETTING_ADSL_ERROR,
 		             NM_SETTING_ADSL_ERROR_INVALID_PROPERTY,
 		             _("'%s' is not a valid value for the property"),
-		             priv->protocol ? priv->protocol : "(null)");
+		             priv->protocol ?: "(null)");
 		g_prefix_error (error, "%s.%s: ", NM_SETTING_ADSL_SETTING_NAME, NM_SETTING_ADSL_PROTOCOL);
 		return FALSE;
 	}
diff --git a/libnm-util/nm-setting-bluetooth.c b/libnm-util/nm-setting-bluetooth.c
index db0b3e92..d26a5b8f 100644
--- a/libnm-util/nm-setting-bluetooth.c
+++ b/libnm-util/nm-setting-bluetooth.c
@@ -60,7 +60,6 @@ nm_setting_bluetooth_error_quark (void)
 	return quark;
 }
 
-
 G_DEFINE_TYPE_WITH_CODE (NMSettingBluetooth, nm_setting_bluetooth, NM_TYPE_SETTING,
                          _nm_register_setting (NM_SETTING_BLUETOOTH_SETTING_NAME,
                                                g_define_type_id,
diff --git a/libnm-util/nm-setting-bond.c b/libnm-util/nm-setting-bond.c
index f56cb428..5a9b9634 100644
--- a/libnm-util/nm-setting-bond.c
+++ b/libnm-util/nm-setting-bond.c
@@ -61,7 +61,6 @@ nm_setting_bond_error_quark (void)
 	return quark;
 }
 
-
 G_DEFINE_TYPE_WITH_CODE (NMSettingBond, nm_setting_bond, NM_TYPE_SETTING,
                          _nm_register_setting (NM_SETTING_BOND_SETTING_NAME,
                                                g_define_type_id,
diff --git a/libnm-util/nm-setting-bridge.c b/libnm-util/nm-setting-bridge.c
index 833728b9..cc189c57 100644
--- a/libnm-util/nm-setting-bridge.c
+++ b/libnm-util/nm-setting-bridge.c
@@ -64,7 +64,6 @@ nm_setting_bridge_error_quark (void)
 	return quark;
 }
 
-
 G_DEFINE_TYPE_WITH_CODE (NMSettingBridge, nm_setting_bridge, NM_TYPE_SETTING,
                          _nm_register_setting (NM_SETTING_BRIDGE_SETTING_NAME,
                                                g_define_type_id,
diff --git a/libnm-util/nm-setting-cdma.c b/libnm-util/nm-setting-cdma.c
index 794945f1..fc76be60 100644
--- a/libnm-util/nm-setting-cdma.c
+++ b/libnm-util/nm-setting-cdma.c
@@ -54,7 +54,6 @@ nm_setting_cdma_error_quark (void)
 	return quark;
 }
 
-
 G_DEFINE_TYPE_WITH_CODE (NMSettingCdma, nm_setting_cdma, NM_TYPE_SETTING,
                          _nm_register_setting (NM_SETTING_CDMA_SETTING_NAME,
                                                g_define_type_id,
diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c
index 28d5fca7..e51d2c91 100644
--- a/libnm-util/nm-setting-connection.c
+++ b/libnm-util/nm-setting-connection.c
@@ -58,7 +58,6 @@ nm_setting_connection_error_quark (void)
 	return quark;
 }
 
-
 G_DEFINE_TYPE_WITH_CODE (NMSettingConnection, nm_setting_connection, NM_TYPE_SETTING,
                          _nm_register_setting (NM_SETTING_CONNECTION_SETTING_NAME,
                                                g_define_type_id,
@@ -273,7 +272,6 @@ nm_setting_connection_get_connection_type (NMSettingConnection *setting)
 	return NM_SETTING_CONNECTION_GET_PRIVATE (setting)->type;
 }
 
-
 /**
  * nm_setting_connection_get_num_permissions:
  * @setting: the #NMSettingConnection
@@ -753,7 +751,6 @@ nm_setting_connection_get_gateway_ping_timeout (NMSettingConnection *setting)
 	return NM_SETTING_CONNECTION_GET_PRIVATE (setting)->gateway_ping_timeout;
 }
 
-
 static gboolean
 verify (NMSetting *setting, GSList *all_settings, GError **error)
 {
diff --git a/libnm-util/nm-setting-dcb.c b/libnm-util/nm-setting-dcb.c
index eaed4ff5..2cd0bdaf 100644
--- a/libnm-util/nm-setting-dcb.c
+++ b/libnm-util/nm-setting-dcb.c
@@ -64,7 +64,6 @@ nm_setting_dcb_error_quark (void)
 	return quark;
 }
 
-
 G_DEFINE_TYPE_WITH_CODE (NMSettingDcb, nm_setting_dcb, NM_TYPE_SETTING,
                          _nm_register_setting (NM_SETTING_DCB_SETTING_NAME,
                                                g_define_type_id,
diff --git a/libnm-util/nm-setting-dcb.h b/libnm-util/nm-setting-dcb.h
index 626f815d..2757200e 100644
--- a/libnm-util/nm-setting-dcb.h
+++ b/libnm-util/nm-setting-dcb.h
@@ -88,7 +88,6 @@ typedef enum {
  */
 #define NM_SETTING_DCB_FCOE_MODE_VN2VN   "vn2vn"
 
-
 /* Properties */
 #define NM_SETTING_DCB_APP_FCOE_FLAGS         "app-fcoe-flags"
 #define NM_SETTING_DCB_APP_FCOE_PRIORITY      "app-fcoe-priority"
@@ -110,7 +109,6 @@ typedef enum {
 #define NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH "priority-strict-bandwidth"
 #define NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS    "priority-traffic-class"
 
-
 typedef struct {
 	NMSetting parent;
 } NMSettingDcb;
diff --git a/libnm-util/nm-setting-gsm.c b/libnm-util/nm-setting-gsm.c
index fd11ce67..82ebde33 100644
--- a/libnm-util/nm-setting-gsm.c
+++ b/libnm-util/nm-setting-gsm.c
@@ -55,7 +55,6 @@ nm_setting_gsm_error_quark (void)
 	return quark;
 }
 
-
 G_DEFINE_TYPE_WITH_CODE (NMSettingGsm, nm_setting_gsm, NM_TYPE_SETTING,
                          _nm_register_setting (NM_SETTING_GSM_SETTING_NAME,
                                                g_define_type_id,
diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c
index 74f4d312..6a01fca9 100644
--- a/libnm-util/nm-setting-ip4-config.c
+++ b/libnm-util/nm-setting-ip4-config.c
@@ -990,13 +990,11 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 	return TRUE;
 }
 
-
 static void
 nm_setting_ip4_config_init (NMSettingIP4Config *setting)
 {
 	NMSettingIP4ConfigPrivate *priv = NM_SETTING_IP4_CONFIG_GET_PRIVATE (setting);
 
-
 	priv->dns = g_array_sized_new (FALSE, TRUE, sizeof (guint32), 3);
 }
 
@@ -1396,7 +1394,6 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
 		                       G_PARAM_STATIC_STRINGS));
 }
 
-
 struct NMIP4Address {
 	guint32 refcount;
 	guint32 address;   /* network byte order */
@@ -1607,7 +1604,6 @@ nm_ip4_address_set_gateway (NMIP4Address *address, guint32 gateway)
 	address->gateway = gateway;
 }
 
-
 struct NMIP4Route {
 	guint32 refcount;
 
diff --git a/libnm-util/nm-setting-ip4-config.h b/libnm-util/nm-setting-ip4-config.h
index 1365de29..4d50547d 100644
--- a/libnm-util/nm-setting-ip4-config.h
+++ b/libnm-util/nm-setting-ip4-config.h
@@ -164,7 +164,6 @@ guint32      nm_ip4_route_get_metric   (NMIP4Route *route);
 void         nm_ip4_route_set_metric   (NMIP4Route *route,
                                         guint32 metric);
 
-
 typedef struct {
 	NMSetting parent;
 } NMSettingIP4Config;
diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c
index 1566fe99..6beeb7da 100644
--- a/libnm-util/nm-setting-ip6-config.c
+++ b/libnm-util/nm-setting-ip6-config.c
@@ -83,7 +83,6 @@ typedef struct {
 	NMSettingIP6ConfigPrivacy ip6_privacy;
 } NMSettingIP6ConfigPrivate;
 
-
 enum {
 	PROP_0,
 	PROP_METHOD,
@@ -174,7 +173,6 @@ nm_setting_ip6_config_get_dns (NMSettingIP6Config *setting, guint32 i)
 {
 	NMSettingIP6ConfigPrivate *priv;
 
-
 	g_return_val_if_fail (NM_IS_SETTING_IP6_CONFIG (setting), NULL);
 
 	priv = NM_SETTING_IP6_CONFIG_GET_PRIVATE (setting);
@@ -946,7 +944,6 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 	return TRUE;
 }
 
-
 static void
 nm_setting_ip6_config_init (NMSettingIP6Config *setting)
 {
diff --git a/libnm-util/nm-setting-ip6-config.h b/libnm-util/nm-setting-ip6-config.h
index 0a2f00dd..2a32a920 100644
--- a/libnm-util/nm-setting-ip6-config.h
+++ b/libnm-util/nm-setting-ip6-config.h
@@ -69,7 +69,6 @@ GQuark nm_setting_ip6_config_error_quark (void);
 #define NM_SETTING_IP6_CONFIG_IP6_PRIVACY        "ip6-privacy"
 #define NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME      "dhcp-hostname"
 
-
 /**
  * NM_SETTING_IP6_CONFIG_METHOD_IGNORE:
  *
@@ -143,7 +142,6 @@ typedef enum {
 	NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR = 2
 } NMSettingIP6ConfigPrivacy;
 
-
 typedef struct NMIP6Address NMIP6Address;
 
 GType nm_ip6_address_get_type (void);
diff --git a/libnm-util/nm-setting-ppp.c b/libnm-util/nm-setting-ppp.c
index 54b070be..3437d1a1 100644
--- a/libnm-util/nm-setting-ppp.c
+++ b/libnm-util/nm-setting-ppp.c
@@ -53,7 +53,6 @@ nm_setting_ppp_error_quark (void)
 	return quark;
 }
 
-
 G_DEFINE_TYPE_WITH_CODE (NMSettingPPP, nm_setting_ppp, NM_TYPE_SETTING,
                          _nm_register_setting (NM_SETTING_PPP_SETTING_NAME,
                                                g_define_type_id,
diff --git a/libnm-util/nm-setting-pppoe.c b/libnm-util/nm-setting-pppoe.c
index 5b729c85..e66165fd 100644
--- a/libnm-util/nm-setting-pppoe.c
+++ b/libnm-util/nm-setting-pppoe.c
@@ -55,7 +55,6 @@ nm_setting_pppoe_error_quark (void)
 	return quark;
 }
 
-
 G_DEFINE_TYPE_WITH_CODE (NMSettingPPPOE, nm_setting_pppoe, NM_TYPE_SETTING,
                          _nm_register_setting (NM_SETTING_PPPOE_SETTING_NAME,
                                                g_define_type_id,
diff --git a/libnm-util/nm-setting-private.h b/libnm-util/nm-setting-private.h
index db5f3afa..e2e02398 100644
--- a/libnm-util/nm-setting-private.h
+++ b/libnm-util/nm-setting-private.h
@@ -80,7 +80,6 @@ gboolean _nm_setting_clear_secrets_with_flags (NMSetting *setting,
                                                NMSettingClearSecretsWithFlagsFn func,
                                                gpointer user_data);
 
-
 /* NM_SETTING_COMPARE_FLAG_INFERRABLE: check whether a device-generated
  * connection can be replaced by a already-defined connection. This flag only
  * takes into account properties marked with the %NM_SETTING_PARAM_INFERRABLE
diff --git a/libnm-util/nm-setting-serial.c b/libnm-util/nm-setting-serial.c
index 8a4b079d..369c4b10 100644
--- a/libnm-util/nm-setting-serial.c
+++ b/libnm-util/nm-setting-serial.c
@@ -55,7 +55,6 @@ nm_setting_serial_error_quark (void)
 	return quark;
 }
 
-
 G_DEFINE_TYPE_WITH_CODE (NMSettingSerial, nm_setting_serial, NM_TYPE_SETTING,
                          _nm_register_setting (NM_SETTING_SERIAL_SETTING_NAME,
                                                g_define_type_id,
@@ -73,7 +72,6 @@ typedef struct {
 	guint64 send_delay;
 } NMSettingSerialPrivate;
 
-
 enum {
 	PROP_0,
 	PROP_BAUD,
diff --git a/libnm-util/nm-setting-team.c b/libnm-util/nm-setting-team.c
index f5dcdc94..0ec40320 100644
--- a/libnm-util/nm-setting-team.c
+++ b/libnm-util/nm-setting-team.c
@@ -61,7 +61,6 @@ nm_setting_team_error_quark (void)
 	return quark;
 }
 
-
 G_DEFINE_TYPE_WITH_CODE (NMSettingTeam, nm_setting_team, NM_TYPE_SETTING,
                          _nm_register_setting (NM_SETTING_TEAM_SETTING_NAME,
                                                g_define_type_id,
diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c
index e47fe394..1fed9eca 100644
--- a/libnm-util/nm-setting-vpn.c
+++ b/libnm-util/nm-setting-vpn.c
@@ -63,7 +63,6 @@ nm_setting_vpn_error_quark (void)
 	return quark;
 }
 
-
 G_DEFINE_TYPE_WITH_CODE (NMSettingVPN, nm_setting_vpn, NM_TYPE_SETTING,
                          _nm_register_setting (NM_SETTING_VPN_SETTING_NAME,
                                                g_define_type_id,
diff --git a/libnm-util/nm-setting-wimax.c b/libnm-util/nm-setting-wimax.c
index 60beb912..102fbb5c 100644
--- a/libnm-util/nm-setting-wimax.c
+++ b/libnm-util/nm-setting-wimax.c
@@ -62,7 +62,6 @@ nm_setting_wimax_error_quark (void)
 	return quark;
 }
 
-
 G_DEFINE_TYPE_WITH_CODE (NMSettingWimax, nm_setting_wimax, NM_TYPE_SETTING,
                          _nm_register_setting (NM_SETTING_WIMAX_SETTING_NAME,
                                                g_define_type_id,
diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c
index 4296d511..8b297ee6 100644
--- a/libnm-util/nm-setting-wired.c
+++ b/libnm-util/nm-setting-wired.c
@@ -60,7 +60,6 @@ nm_setting_wired_error_quark (void)
 	return quark;
 }
 
-
 G_DEFINE_TYPE_WITH_CODE (NMSettingWired, nm_setting_wired, NM_TYPE_SETTING,
                          _nm_register_setting (NM_SETTING_WIRED_SETTING_NAME,
                                                g_define_type_id,
diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c
index 22808fea..00d35a2f 100644
--- a/libnm-util/nm-setting-wireless-security.c
+++ b/libnm-util/nm-setting-wireless-security.c
@@ -73,7 +73,6 @@ nm_setting_wireless_security_error_quark (void)
 	return quark;
 }
 
-
 G_DEFINE_TYPE_WITH_CODE (NMSettingWirelessSecurity, nm_setting_wireless_security, NM_TYPE_SETTING,
                          _nm_register_setting (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
                                                g_define_type_id,
diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c
index 3341fc8b..d3040811 100644
--- a/libnm-util/nm-setting-wireless.c
+++ b/libnm-util/nm-setting-wireless.c
@@ -61,7 +61,6 @@ nm_setting_wireless_error_quark (void)
 	return quark;
 }
 
-
 G_DEFINE_TYPE_WITH_CODE (NMSettingWireless, nm_setting_wireless, NM_TYPE_SETTING,
                          _nm_register_setting (NM_SETTING_WIRELESS_SETTING_NAME,
                                                g_define_type_id,
diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c
index 760b3cac..c74d2d71 100644
--- a/libnm-util/nm-setting.c
+++ b/libnm-util/nm-setting.c
@@ -1329,7 +1329,6 @@ nm_setting_get_virtual_iface_name (NMSetting *setting)
 	return NULL;
 }
 
-
 NMSettingVerifyResult
 _nm_setting_verify_deprecated_virtual_iface_name (const char *interface_name,
                                                   gboolean allow_missing,
diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h
index ce5cf3f5..1470a69b 100644
--- a/libnm-util/nm-setting.h
+++ b/libnm-util/nm-setting.h
@@ -62,7 +62,6 @@ typedef enum
 #define NM_SETTING_ERROR nm_setting_error_quark ()
 GQuark nm_setting_error_quark (void);
 
-
 /* DEPRECATED AND UNUSED */
 #define NM_SETTING_PARAM_SERIALIZE    (1 << (0 + G_PARAM_USER_SHIFT))
 
@@ -79,7 +78,6 @@ GQuark nm_setting_error_quark (void);
 
 /* Note: all non-glib GParamFlags bits are reserved by NetworkManager */
 
-
 #define NM_SETTING_NAME "name"
 
 /**
@@ -156,7 +154,6 @@ typedef enum {
 	/* 0x80000000 is used for a private flag */
 } NMSettingCompareFlags;
 
-
 /**
  * NMSetting:
  *
@@ -167,7 +164,6 @@ typedef struct {
 	GObject parent;
 } NMSetting;
 
-
 /**
  * NMSettingClearSecretsWithFlagsFn:
  * @setting: The setting for which secrets are being iterated
@@ -241,7 +237,6 @@ typedef void (*NMSettingValueIterFn) (NMSetting *setting,
                                       GParamFlags flags,
                                       gpointer user_data);
 
-
 GType nm_setting_get_type (void);
 
 /**
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index 5d80b2a4..2af9432f 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -127,7 +127,6 @@ static const struct IsoLangToEncodings isoLangEntries2[] =
 	{ NULL, {NULL, NULL, NULL} }
 };
 
-
 static GHashTable * langToEncodings5 = NULL;
 static GHashTable * langToEncodings2 = NULL;
 
@@ -159,7 +158,6 @@ init_lang_to_encodings_hash (void)
 	}
 }
 
-
 static gboolean
 get_encodings_for_lang (const char *lang,
                         char **encoding1,
@@ -234,7 +232,7 @@ nm_utils_init (GError **error)
 	if (!initialized) {
 		initialized = TRUE;
 
-		bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+		bindtextdomain (GETTEXT_PACKAGE, NMLOCALEDIR);
 		bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
 		if (!crypto_init (error))
@@ -1105,7 +1103,6 @@ nm_utils_ip4_prefix_to_netmask (guint32 prefix)
 	return _nm_utils_ip4_prefix_to_netmask (prefix);
 }
 
-
 /**
  * nm_utils_ip4_get_default_prefix:
  * @ip: an IPv4 address (in network byte order)
@@ -1674,7 +1671,6 @@ nm_utils_rsa_key_encrypt (const GByteArray *data,
                           GError **error)
 {
 
-
 	return nm_utils_rsa_key_encrypt_helper (CIPHER_DES_EDE3_CBC,
 	                                        data,
 	                                        in_password,
@@ -2478,7 +2474,7 @@ static char _nm_utils_inet_ntop_buffer[NM_UTILS_INET_ADDRSTRLEN];
 const char *
 nm_utils_inet4_ntop (in_addr_t inaddr, char *dst)
 {
-	return inet_ntop (AF_INET, &inaddr, dst ? dst : _nm_utils_inet_ntop_buffer,
+	return inet_ntop (AF_INET, &inaddr, dst ?: _nm_utils_inet_ntop_buffer,
 	                  INET_ADDRSTRLEN);
 }
 
@@ -2506,7 +2502,7 @@ const char *
 nm_utils_inet6_ntop (const struct in6_addr *in6addr, char *dst)
 {
 	g_return_val_if_fail (in6addr, NULL);
-	return inet_ntop (AF_INET6, in6addr, dst ? dst : _nm_utils_inet_ntop_buffer,
+	return inet_ntop (AF_INET6, in6addr, dst ?: _nm_utils_inet_ntop_buffer,
 	                  INET6_ADDRSTRLEN);
 }
 
@@ -2578,7 +2574,6 @@ nm_utils_check_virtual_device_compatibility (GType virtual_type, GType other_typ
 gconstpointer nm_utils_get_private (void);
 gconstpointer nm_util_get_private (void);
 
-
 /**
  * nm_utils_get_private:
  *
diff --git a/libnm-util/nm-value-transforms.c b/libnm-util/nm-value-transforms.c
index 2d31f129..13f9eb43 100644
--- a/libnm-util/nm-value-transforms.c
+++ b/libnm-util/nm-value-transforms.c
@@ -104,7 +104,7 @@ _nm_utils_convert_string_list_to_string (const GValue *src_value, GValue *dest_v
 	for (iter = strings; iter; iter = iter->next) {
 		if (iter != strings)
 			g_string_append_c (printable, ',');
-		g_string_append (printable, iter->data ? iter->data : "(null)");
+		g_string_append (printable, iter->data ?: "(null)");
 	}
 
 	g_value_take_string (dest_value, g_string_free (printable, FALSE));
diff --git a/libnm-util/tests/meson.build b/libnm-util/tests/meson.build
index 63535033..cf46ad14 100644
--- a/libnm-util/tests/meson.build
+++ b/libnm-util/tests/meson.build
@@ -6,10 +6,8 @@ deps = [
 ]
 
 cflags = common_cflags + [
-  '-DBUILD_DIR="@0@"'.format(meson.current_build_dir()),
-  '-DTEST_CERT_DIR="@0@"'.format(test_cert_dir),
   '-DNETWORKMANAGER_COMPILATION_TEST',
-]
+] + nm_build_cflags
 
 test = 'test-libnm-linking'
 
diff --git a/libnm-util/tests/test-crypto.c b/libnm-util/tests/test-crypto.c
index 83a183dd..61bd9774 100644
--- a/libnm-util/tests/test-crypto.c
+++ b/libnm-util/tests/test-crypto.c
@@ -33,6 +33,8 @@
 
 #include "nm-utils/nm-test-utils.h"
 
+#define TEST_CERT_DIR                         NM_BUILD_SRCDIR"/libnm-core/tests/certs"
+
 #if 0
 static const char *pem_rsa_key_begin = "-----BEGIN RSA PRIVATE KEY-----";
 static const char *pem_rsa_key_end = "-----END RSA PRIVATE KEY-----";
diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c
index 74eb7cdd..304797a9 100644
--- a/libnm-util/tests/test-general.c
+++ b/libnm-util/tests/test-general.c
@@ -2428,7 +2428,8 @@ test_libnm_linking (void)
 	int status;
 	GError *error = NULL;
 
-	g_spawn_sync (BUILD_DIR, argv, NULL, 0 /*G_SPAWN_DEFAULT*/,
+	g_spawn_sync (NM_BUILD_BUILDDIR"/libnm-util/tests",
+	              argv, NULL, 0 /*G_SPAWN_DEFAULT*/,
 	              _test_libnm_linking_setup_child_process, NULL,
 	              &out, &err, &status, &error);
 	g_assert_no_error (error);
diff --git a/libnm-util/tests/test-secrets.c b/libnm-util/tests/test-secrets.c
index 2631509c..43c206ff 100644
--- a/libnm-util/tests/test-secrets.c
+++ b/libnm-util/tests/test-secrets.c
@@ -39,7 +39,8 @@
 
 #include "nm-utils/nm-test-utils.h"
 
-#define TEST_NEED_SECRETS_EAP_TLS_CA_CERT TEST_CERT_DIR "/test_ca_cert.pem"
+#define TEST_CERT_DIR                         NM_BUILD_SRCDIR"/libnm-core/tests/certs"
+#define TEST_NEED_SECRETS_EAP_TLS_CA_CERT     TEST_CERT_DIR "/test_ca_cert.pem"
 #define TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT TEST_CERT_DIR "/test_key_and_cert.pem"
 #define TEST_NEED_SECRETS_EAP_TLS_PRIVATE_KEY TEST_CERT_DIR "/test_key_and_cert.pem"
 
diff --git a/libnm-util/tests/test-setting-8021x.c b/libnm-util/tests/test-setting-8021x.c
index a0219639..373b2a75 100644
--- a/libnm-util/tests/test-setting-8021x.c
+++ b/libnm-util/tests/test-setting-8021x.c
@@ -29,6 +29,8 @@
 
 #include "nm-utils/nm-test-utils.h"
 
+#define TEST_CERT_DIR                         NM_BUILD_SRCDIR"/libnm-core/tests/certs"
+
 static void
 compare_blob_data (const char *test,
                    const char *key_path,