Import Debian changes 1.18.0-1ubuntu1

network-manager (1.18.0-1ubuntu1) eoan; urgency=medium

  * Update to 1.18, merge on Debian, new version includes nwe support for
    policy routing rules and for VLAN filtering for Linux bridge.
  * Remaining Ubuntu changes
    - Use systemd-resolved instead of dnsmasq
    - debian/control:
      + Depend on isc-dhcp-client instead of recommends
      + Recommend network-manager-pptp
      + Suggest avahi-autoipd for IPv4LL support
    - debian/rules, debian/network-manager.postinst:
      + Don't restart NetworkManager on upgrade but recommend restarting
        the computer
    - debian/rules, debian/network-manager.postinst:
      + Don't install sysvinit scripts or migrate from sysvinit
    - debian/network-manager.postinst:
      + Don't add the netdev group.
      + drop in an empty override file for NetworkManager to manage all
        devices for upgrade from any version, as long as there is no
        netplan configuration yet.
    - debian/default-wifi-powersave-on.conf, debian/rules:
      + Install a config file to enable WiFi powersave
    - Enable build tests
    - Add autopkgtests
    - debian/source_network-manager.py, debian/network-manager.install,
      debian/network-manager.links: Add apport hook
    - Add network-manager-config-connectivity-ubuntu package
    - NetworkManager.conf: disable MAC randomization feature. There is no
      easy way for desktop users to disable this feature yet. And there are
      reports that it doesn't work well with some systems.
    - Update Vcs links to point to Ubuntu branch
    - Add patches. See patch descriptions for more details:
      + Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch
      + Update-dnsmasq-parameters.patch
      + Disable-general-with-expect.patch
      + libnm-Check-self-still-NMManager-or-not.patch
      + dns-manager-don-t-merge-split-DNS-search-domains.patch (but disabled)
      + Read-system-connections-from-run.patch
    - debian/tests/urfkill-integration - don't stop/start network manager
    - Revert "Add Conflicts to network-manager-dev against deprecated libraries"
      This reverts commit b4acc5e03e2b821e1cccc69529bb70826c741942.  We're still
      building libnm-glib for now, so these packages have a use in Ubuntu.
  * Removed delta, not needed anymore
    - debian/network-manager.maintscript
      + Remove /etc/dbus-1/system.d/nm-ofono.conf

1 files changed, 19 insertions, 23 deletions

diff --git a/src/nm-logging.c b/src/nm-logging.c
index 1ee94645..48e51421 100644
--- a/src/nm-logging.c
+++ b/src/nm-logging.c
@@ -37,7 +37,7 @@
 #include <systemd/sd-journal.h>
 #endif
 
-#include "nm-utils/nm-time-utils.h"
+#include "nm-glib-aux/nm-time-utils.h"
 #include "nm-errors.h"
 
 /*****************************************************************************/
@@ -302,7 +302,8 @@ nm_logging_setup (const char  *level,
 	NMLogDomain new_log_state[_LOGL_N_REAL];
 	NMLogLevel cur_log_level;
 	NMLogLevel new_log_level;
-	char **tmp, **iter;
+	gs_free const char **domains_v = NULL;
+	gsize i_d;
 	int i;
 	gboolean had_platform_debug;
 	gs_free char *domains_free = NULL;
@@ -337,28 +338,24 @@ nm_logging_setup (const char  *level,
 		}
 	}
 
-	tmp = g_strsplit_set (domains, ", ", 0);
-	for (iter = tmp; iter && *iter; iter++) {
+	domains_v = nm_utils_strsplit_set (domains, ", ");
+	for (i_d = 0; domains_v && domains_v[i_d]; i_d++) {
+		const char *s = domains_v[i_d];
+		const char *p;
 		const LogDesc *diter;
 		NMLogLevel domain_log_level;
 		NMLogDomain bits;
-		char *p;
 
 		/* LOGD_VPN_PLUGIN is protected, that is, when setting ALL or DEFAULT,
 		 * it does not enable the verbose levels DEBUG and TRACE, because that
 		 * may expose sensitive data. */
 		NMLogDomain protect = LOGD_NONE;
 
-		if (!strlen (*iter))
-			continue;
-
-		p = strchr (*iter, ':');
+		p = strchr (s, ':');
 		if (p) {
-			*p = '\0';
-			if (!match_log_level (p + 1, &domain_log_level, error)) {
-				g_strfreev (tmp);
+			*((char *) p) = '\0';
+			if (!match_log_level (p + 1, &domain_log_level, error))
 				return FALSE;
-			}
 		} else
 			domain_log_level = new_log_level;
 
@@ -372,26 +369,26 @@ nm_logging_setup (const char  *level,
 		}
 
 		/* Check for combined domains */
-		if (!g_ascii_strcasecmp (*iter, LOGD_ALL_STRING)) {
+		if (!g_ascii_strcasecmp (s, LOGD_ALL_STRING)) {
 			bits = LOGD_ALL;
 			protect = LOGD_VPN_PLUGIN;
-		} else if (!g_ascii_strcasecmp (*iter, LOGD_DEFAULT_STRING)) {
+		} else if (!g_ascii_strcasecmp (s, LOGD_DEFAULT_STRING)) {
 			bits = LOGD_DEFAULT;
 			protect = LOGD_VPN_PLUGIN;
-		} else if (!g_ascii_strcasecmp (*iter, LOGD_DHCP_STRING))
+		} else if (!g_ascii_strcasecmp (s, LOGD_DHCP_STRING))
 			bits = LOGD_DHCP;
-		else if (!g_ascii_strcasecmp (*iter, LOGD_IP_STRING))
+		else if (!g_ascii_strcasecmp (s, LOGD_IP_STRING))
 			bits = LOGD_IP;
 
 		/* Check for compatibility domains */
-		else if (!g_ascii_strcasecmp (*iter, "HW"))
+		else if (!g_ascii_strcasecmp (s, "HW"))
 			bits = LOGD_PLATFORM;
-		else if (!g_ascii_strcasecmp (*iter, "WIMAX"))
+		else if (!g_ascii_strcasecmp (s, "WIMAX"))
 			continue;
 
 		else {
 			for (diter = &domain_desc[0]; diter->name; diter++) {
-				if (!g_ascii_strcasecmp (diter->name, *iter)) {
+				if (!g_ascii_strcasecmp (diter->name, s)) {
 					bits = diter->num;
 					break;
 				}
@@ -400,7 +397,7 @@ nm_logging_setup (const char  *level,
 			if (!bits) {
 				if (!bad_domains) {
 					g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_LOG_DOMAIN,
-					             _("Unknown log domain '%s'"), *iter);
+					             _("Unknown log domain '%s'"), s);
 					return FALSE;
 				}
 
@@ -408,7 +405,7 @@ nm_logging_setup (const char  *level,
 					g_string_append (unrecognized, ", ");
 				else
 					unrecognized = g_string_new (NULL);
-				g_string_append (unrecognized, *iter);
+				g_string_append (unrecognized, s);
 				continue;
 			}
 		}
@@ -429,7 +426,6 @@ nm_logging_setup (const char  *level,
 			}
 		}
 	}
-	g_strfreev (tmp);
 
 	g_clear_pointer (&gl_main.logging_domains_to_string, g_free);