lp:~lkundrak/network-manager/launchpad-stable-1.4

Branch merges

This import branch has no branches proposed for merge into it.

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

10889. By Thomas Haller on 2017-05-23

clients: fix appending integer to result in nmc_property_set_bytes()

(cherry picked from commit d76c190dc72df042733cca13849e18bcc13eed65)
(cherry picked from commit 06d3c95e4fc70561b12be80e5982487443d914ec)

10888. By Beniamino Galvani <email address hidden> on 2017-05-23

clients: fix setter for 802-1x.password-raw

The property is a GBytes, not a GByteArray.

https://bugzilla.gnome.org/show_bug.cgi?id=782836
(cherry picked from commit 30393ee2360e8678188cc47d794f2199d50e82ba)
(cherry picked from commit cc6c9468fc01d69505141ee8956766079dbed903)

10887. By Thomas Haller on 2017-05-02

policy: fix memleak in lookup_callback() and cancelling

When the operation is cancelled, we must not touch user_data. Note that
NM_POLICY_GET_PRIVATE() theoretically doesn't dereference the pointer
(does it?) but doing pointer arithmetic on a dangling pointer is a very
ugly thing to do.

And of course, the memleak.

Fixes: 5c716c8af8ddca1d3f7510494754d875b01a8889
Fixes: a2cdf632045d60b26f7aff470dedb56c1f9b938d
(cherry picked from commit 3215508293c26e9e8531c2482def598ef1bbbefd)
(cherry picked from commit f1469558c0e117b41b2eb36ab1010f732a696374)

10886. By Thomas Haller on 2017-04-26

device: fix restricting Generic connection by interface-name

NMDeviceGeneric:check_connection_compatible() doesn't check for a
matching interface name. It relies on the parent implementation to
do that.

The parent implementation calls nm_manager_get_connection_iface().
That fails for NM_SETTING_GENERIC_SETTING_NAME, because that one has
no factory. Maybe this imbalance of having no factory for the Generic device
is wrong, but usually factories only match a distinct set of device
types, while the generic factory would handle them all (as last resort).

Without this, activating a generic connection might activate the
wrong interface.

(cherry picked from commit 3876b10a4749638c3dcfa7e65b12bfee8030334c)
(cherry picked from commit 753a2cc4d9c4bbf9ad6833ff0f073883ea3de7a0)
(cherry picked from commit bd72919b476eb4f6eeb41fa22b34422576fd0eed)

10885. By Beniamino Galvani <email address hidden> on 2017-04-24

vlan: use parent interface mtu as default

VLANs already inherit the MTU from parent device when manually
activated. At boot, since the vlan interface is created before
activating the parent, the MTU is left to the default value.

Fix this by inheriting the MTU from parent when activating the
VLAN. Note that this change is effective only when the connection has
an actual IPv4 configuration; for all other cases users should
explicitly set the desired MTU value in the 'ethernet.mtu' property.

See master commit 7dde8d810604 ("vlan: use parent interface mtu as default")

https://bugzilla.redhat.com/show_bug.cgi?id=1439166

10884. By Thomas Haller on 2017-04-24

libnm: diconnect signal handler for NMObject from GDBusProxy

Similar to commit 0429753dab39c245f280c47ee269d88cf92d7061 from
nm-1-6 branch.

Related: https://bugzilla.gnome.org/show_bug.cgi?id=778615
https://bugzilla.redhat.com/show_bug.cgi?id=1436603

10883. By Lubomir Rintel on 2017-04-24

sparse: avoid clash with __bitwise and __force from 4.10 linux/types.h

It also used __bitwise and __force. It seems easier to rename
our versions since they are local to this one single header.

Also, undefine them afteerwards, so that we don't pollute the
preprocessor macro namespace.

https://github.com/systemd/systemd/pull/5061
(cherry picked from commit 13b2ac2214cb56264fc1e9b96e4ed4382da2db78)

10882. By Thomas Haller on 2017-04-20

build: fix type on Makefile.am

Fixes: 3cc00dd550fcbd83ec2f1af9eeb83bf5ec921d21
(cherry picked from commit e824dd34f0dc1bda10ab4102fc27d90f85c1462a)
(cherry picked from commit 2ebc390734a9eaa65109ee989eed12282306aec7)

10881. By Thomas Haller on 2017-04-20

ifcfg: also read DEFROUTE and GATEWAY from alias files

Also accept DEFROUTE and GATEWAY when they are defined in
alias files -- provided, that they are not yet defined
in the main ifcfg file.

(cherry picked from commit 3cc00dd550fcbd83ec2f1af9eeb83bf5ec921d21)
(cherry picked from commit 4c595997f2037707fcc9800c38a8ee8a6630c0e3)

10880. By Thomas Haller on 2017-04-20

ifcfg: ensure ipv4.method is not "disabled" when reading IP addresses from alias files

When the main ifcfg file contains no IP addresses, the method
will be "disabled". Later, when reading IP addresses for the
aliases, we must ensure that the method is manual.

Otherwise, validation fails with

  ip.addresses: this property is not allowed for method=disabled

(cherry picked from commit a8f0d88596d8dd2b807a7b0adee272c4f077dade)
(cherry picked from commit be1daa4580267e448ad93b854da382026ea63281)