From ac8a90d3aa7bde730482a4b01c8a61ce7f5ab888 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 13 Jul 2015 12:29:18 +0200
Subject: [PATCH] default-route-manager: don't add entries with (!synced &&
 never_default)

Entries with (!synced && never_default) make no sense. Don't add them
to the list of tracked entires.

(cherry picked from commit befb36691a9336e5e4b80b4f87e5f483da3a4f3f)
---
 src/nm-default-route-manager.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/nm-default-route-manager.c b/src/nm-default-route-manager.c
index 8107ae9274..0dfe2d52bf 100644
--- a/src/nm-default-route-manager.c
+++ b/src/nm-default-route-manager.c
@@ -792,8 +792,15 @@ _ipx_update_default_route (const VTableIP *vtable, NMDefaultRouteManager *self,
 			synced = TRUE;
 		}
 	}
+
 	g_assert (!default_route || default_route->plen == 0);
 
+	if (!synced && never_default) {
+		/* having a non-synced, never-default entry is non-sensical. Unset
+		 * @default_route so that we don't add such an entry below. */
+		default_route = NULL;
+	}
+
 	if (!entry && !default_route)
 		/* nothing to do */;
 	else if (!entry) {