File NetworkManager-dhcpv6.patch of Package NetworkManager.4336

From bcd554724e796a482df5c54ebdafb97d6e81b10e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Sch=C3=A4fer?= <tschaefer@t-online.de>
Date: Thu, 17 Jul 2014 15:50:21 -0500
Subject: dhcp: let dhclient handle requesting the 'server-id' option

Always requesting this appears to cause some devices to ignore
DHCP requests, like the ZTE 823D, ZTEMF93E, Alcatel W800Z.
dhclient probably knows better than NM when to request the
server's ID, so leave that up to dhclient.  We don't do anything
interesting with it anyway.

Index: NetworkManager-0.9.8.8/src/dhcp-manager/nm-dhcp-dhclient-utils.c
===================================================================
--- NetworkManager-0.9.8.8.orig/src/dhcp-manager/nm-dhcp-dhclient-utils.c
+++ NetworkManager-0.9.8.8/src/dhcp-manager/nm-dhcp-dhclient-utils.c
@@ -222,7 +222,6 @@ nm_dhcp_dhclient_create_config (const ch
 		add_also_request (alsoreq, "dhcp6.name-servers");
 		add_also_request (alsoreq, "dhcp6.domain-search");
 		add_also_request (alsoreq, "dhcp6.client-id");
-		add_also_request (alsoreq, "dhcp6.server-id");
 	} else {
 		add_ip4_config (new_contents, s_ip4, hostname);
 		add_also_request (alsoreq, "rfc3442-classless-static-routes");