lp://staging/~lkundrak/network-manager/launchpad-stable-1.4
- Get this branch:
- bzr branch lp://staging/~lkundrak/network-manager/launchpad-stable-1.4
Branch merges
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at git://people.freedesktop.org/~lkundrak/lp-network-manager,branch=nm-1-4.
Last successful import was .
Recent revisions
- 10889. By Thomas Haller
-
clients: fix appending integer to result in nmc_property_
set_bytes( ) (cherry picked from commit d76c190dc72df04
2733cca13849e18 bcc13eed65)
(cherry picked from commit 06d3c95e4fc70561b12be80e598248 7443d914ec) - 10888. By Beniamino Galvani <email address hidden>
-
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 30393ee2360e8678188cc47d794f21 99d50e82ba)
(cherry picked from commit cc6c9468fc01d69505141ee8956766 079dbed903) - 10887. By Thomas Haller
-
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: 5c716c8af8ddca1
d3f7510494754d8 75b01a8889
Fixes: a2cdf632045d60b26f7aff470dedb5 6c1f9b938d
(cherry picked from commit 3215508293c26e9e8531c2482def59 8ef1bbbefd)
(cherry picked from commit f1469558c0e117b41b2eb36ab1010f 732a696374) - 10886. By Thomas Haller
-
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 3876b10a4749638
c3dcfa7e65b12bf ee8030334c)
(cherry picked from commit 753a2cc4d9c4bbf9ad6833ff0f0738 83ea3de7a0)
(cherry picked from commit bd72919b476eb4f6eeb41fa22b3442 2576fd0eed) - 10885. By Beniamino Galvani <email address hidden>
-
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")
- 10884. By Thomas Haller
-
libnm: diconnect signal handler for NMObject from GDBusProxy
Similar to commit 0429753dab39c24
5f280c47ee269d8 8cf92d7061 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
-
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 13b2ac2214cb56264fc1e9b96e4ed4 382da2db78) - 10882. By Thomas Haller
-
build: fix type on Makefile.am
Fixes: 3cc00dd550fcbd8
3ec2f1af9eeb83b f5ec921d21
(cherry picked from commit e824dd34f0dc1bda10ab4102fc27d9 0f85c1462a)
(cherry picked from commit 2ebc390734a9eaa65109ee989eed12 282306aec7) - 10881. By Thomas Haller
-
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 3cc00dd550fcbd8
3ec2f1af9eeb83b f5ec921d21)
(cherry picked from commit 4c595997f2037707fcc9800c38a8ee 8a6630c0e3) - 10880. By Thomas Haller
-
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 a8f0d88596d8dd2
b807a7b0adee272 c4f077dade)
(cherry picked from commit be1daa4580267e448ad93b854da382 026ea63281)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)