NM: version bump
This commit is contained in:
+54
@@ -0,0 +1,54 @@
|
||||
From 11aa07ed939193e85516c287a57dee1837242972 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Haller <thaller@redhat.com>
|
||||
Date: Mon, 4 Jan 2016 18:54:26 +0100
|
||||
Subject: [PATCH] core: fix failure to configure routes due to wrong
|
||||
device-route for IPv4 peer-addresses
|
||||
|
||||
As in the case of a OpenVPN connection, we might add an address like:
|
||||
10.8.0.58/32 ptp 10.8.0.57
|
||||
|
||||
In this case, kernel would automatically add a device-route like:
|
||||
10.8.0.57/32 via 0.0.0.0 dev 32 metric 0 mss 0 src rtprot-kernel scope link pref-src 10.8.0.58
|
||||
|
||||
nm_ip4_config_commit() checks all IP addresses to figure out
|
||||
the present device-routes. Then the routes are synced by NMRouteManager.
|
||||
Due to a bug, we would not consider the peer-address, but the local-address
|
||||
and configure a route 10.8.0.58/32, instead of 10.8.0.57/32.
|
||||
|
||||
That stays mostly unnoticed, because usually the peer and the local-address are
|
||||
in the same subnet, so that there is no difference (/32 is an example of the
|
||||
peer-address being in a different subnet).
|
||||
|
||||
It also seems that due to a bug fixed by df4e5357521 this issue didn't surface.
|
||||
Probably because we would not notice the 10.8.0.57/32 right away and thus
|
||||
nm_route_manager_ip4_route_sync() would not wrongly delete it.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=759892
|
||||
|
||||
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809195
|
||||
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809494
|
||||
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809526
|
||||
https://bugs.archlinux.org/task/47535
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1294309
|
||||
https://mail.gnome.org/archives/networkmanager-list/2015-December/msg00059.html
|
||||
---
|
||||
src/nm-ip4-config.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
|
||||
index f625d35..61e29af 100644
|
||||
--- a/src/nm-ip4-config.c
|
||||
+++ b/src/nm-ip4-config.c
|
||||
@@ -298,7 +298,8 @@ nm_ip4_config_commit (const NMIP4Config *config, int ifindex, gboolean routes_fu
|
||||
|
||||
route.ifindex = ifindex;
|
||||
route.source = NM_IP_CONFIG_SOURCE_KERNEL;
|
||||
- route.network = nm_utils_ip4_address_clear_host_address (addr->address, addr->plen);
|
||||
+ route.network = nm_utils_ip4_address_clear_host_address (addr->peer_address ? : addr->address,
|
||||
+ addr->plen);
|
||||
route.plen = addr->plen;
|
||||
route.pref_src = addr->address;
|
||||
route.metric = default_route_metric;
|
||||
--
|
||||
2.6.4
|
||||
|
||||
-34
@@ -1,34 +0,0 @@
|
||||
From 35c9e8d5321b6451fb74f8e7231a690c940a6e69 Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
||||
Date: Wed, 6 May 2015 20:49:57 +0200
|
||||
Subject: [PATCH] dns: Fix falling back in the resolv.conf methods
|
||||
|
||||
---
|
||||
src/dns-manager/nm-dns-manager.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
|
||||
index 2f8ceab..eade2a0 100644
|
||||
--- a/src/dns-manager/nm-dns-manager.c
|
||||
+++ b/src/dns-manager/nm-dns-manager.c
|
||||
@@ -782,13 +782,16 @@ update_dns (NMDnsManager *self,
|
||||
|
||||
#ifdef NETCONFIG_PATH
|
||||
if (success == FALSE) {
|
||||
+ g_clear_error (error);
|
||||
success = dispatch_netconfig (searches, nameservers,
|
||||
nis_domain, nis_servers, error);
|
||||
}
|
||||
#endif
|
||||
|
||||
- if (success == FALSE)
|
||||
+ if (success == FALSE) {
|
||||
+ g_clear_error (error);
|
||||
success = update_resolv_conf (searches, nameservers, error);
|
||||
+ }
|
||||
|
||||
/* signal that resolv.conf was changed */
|
||||
if (success)
|
||||
--
|
||||
2.4.0
|
||||
|
||||
-48
@@ -1,48 +0,0 @@
|
||||
From 4099c9242b091604466dda081dc5f6909354258b Mon Sep 17 00:00:00 2001
|
||||
From: M. Vefa Bicakci <m.v.b@runbox.com>
|
||||
Date: Sat, 24 May 2014 23:37:00 +0000
|
||||
Subject: core: fix crash during Wi-Fi rescan by emitting NM_DEVICE_AUTH_REQUEST signal correctly
|
||||
|
||||
Fixes regression introduced by commit da59b6d2229b85afbb9e14846931376340dc6030.
|
||||
|
||||
https://mail.gnome.org/archives/networkmanager-list/2014-May/msg00038.html
|
||||
|
||||
Backport-of: d9653484859c426f707b4759bc9882f7a57c1152
|
||||
[thaller@redhat.com: original patch modified in nm-device-wifi.c to pass no
|
||||
connection, as it is done on master]
|
||||
Signed-off-by: Thomas Haller <thaller@redhat.com>
|
||||
---
|
||||
diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c
|
||||
index 8ca5278..052d68f 100644
|
||||
--- a/zsrc/nm-device-wifi.c
|
||||
+++ b/src/nm-device-wifi.c
|
||||
@@ -1563,6 +1563,7 @@ impl_device_request_scan (NMDeviceWifi *self,
|
||||
g_signal_emit_by_name (device,
|
||||
NM_DEVICE_AUTH_REQUEST,
|
||||
context,
|
||||
+ NULL,
|
||||
NM_AUTH_PERMISSION_NETWORK_CONTROL,
|
||||
TRUE,
|
||||
request_scan_cb,
|
||||
diff --git a/src/nm-manager.c b/src/nm-manager.c
|
||||
index 9037e64..96bf3b4 100644
|
||||
--- a/src/nm-manager.c
|
||||
+++ b/src/nm-manager.c
|
||||
@@ -1874,10 +1874,10 @@ device_auth_request_cb (NMDevice *device,
|
||||
}
|
||||
|
||||
/* Ensure the subject has permissions for this connection */
|
||||
- if (!nm_auth_uid_in_acl (connection,
|
||||
- priv->session_monitor,
|
||||
- sender_uid,
|
||||
- &error_desc)) {
|
||||
+ if (connection != NULL && !nm_auth_uid_in_acl (connection,
|
||||
+ priv->session_monitor,
|
||||
+ sender_uid,
|
||||
+ &error_desc)) {
|
||||
error = g_error_new_literal (NM_MANAGER_ERROR,
|
||||
NM_MANAGER_ERROR_PERMISSION_DENIED,
|
||||
error_desc);
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
|
||||
Reference in New Issue
Block a user