rpms/NetworkManager/FC-4 NetworkManager-0.4-static-ip-nameservers.patch, 1.3, 1.4 NetworkManager.spec, 1.53, 1.54

[fedora-cvs-commits at redhat.com]

Author: dcbw

Update of /cvs/dist/rpms/NetworkManager/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv30816

Modified Files:
	NetworkManager-0.4-static-ip-nameservers.patch 
	NetworkManager.spec 
Log Message:
* Wed Jun 15 2005 Dan Williams <dcbw at redhat.com> - 0.4-17.cvs20050404
- Fix static IP configuration to not segfault NetworkManager
- Update NM's idea of the IP address after static config



NetworkManager-0.4-static-ip-nameservers.patch:
 Makefile.am                     |    1 
 NetworkManagerDevice.c          |    3 +
 NetworkManagerSystem.c          |  118 ++++++++++++++++++++++++++++++++++++++++
 NetworkManagerSystem.h          |    5 +
 backends/NetworkManagerRedHat.c |  110 +++++++++++++++++++++++++++++++++++++
 5 files changed, 236 insertions(+), 1 deletion(-)

Index: NetworkManager-0.4-static-ip-nameservers.patch
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-4/NetworkManager-0.4-static-ip-nameservers.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NetworkManager-0.4-static-ip-nameservers.patch	13 Jun 2005 15:33:24 -0000	1.3
+++ NetworkManager-0.4-static-ip-nameservers.patch	15 Jun 2005 19:44:55 -0000	1.4
@@ -76,7 +76,7 @@
 +				continue;
 +
 +			/* Allow space-separated search domains */
-+			if (split_searches == g_strsplit (searches, " ", 0))
++			if (split_searches = g_strsplit (searches, " ", 0))
 +			{
 +				int m, srch_len;
 +
@@ -161,10 +161,10 @@
 +	g_return_val_if_fail (data != NULL, FALSE);
 +
 +	nameserver = g_strdup_printf ("%u.%u.%u.%u",
-+				      ((unsigned char *)ip4_nameserver)[0],
-+				      ((unsigned char *)ip4_nameserver)[1],
-+				      ((unsigned char *)ip4_nameserver)[2],
-+				      ((unsigned char *)ip4_nameserver)[3]);
++				      ((unsigned char *)&ip4_nameserver)[0],
++				      ((unsigned char *)&ip4_nameserver)[1],
++				      ((unsigned char *)&ip4_nameserver)[2],
++				      ((unsigned char *)&ip4_nameserver)[3]);
 +	nm_info ("Adding nameserver: %s", nameserver);
 +
 +	if ((id = nm_named_manager_add_nameserver_ipv4 (data->named, nameserver, &error)))
@@ -219,7 +219,7 @@
 +
 +	g_return_val_if_fail (dev != NULL, FALSE);
 +	g_return_val_if_fail (search != NULL, FALSE);
-+	g_return_val_if_fail (strlen (search) <= 0, FALSE);
++	g_return_val_if_fail (strlen (search) >= 0, FALSE);
 +
 +	data = nm_device_get_app_data (dev);
 +	g_return_val_if_fail (data != NULL, FALSE);
@@ -267,13 +267,14 @@
 +
 --- NetworkManager-0.4/src/NetworkManagerDevice.c.static-ip-nameservers	2005-06-13 11:17:52.000000000 -0400
 +++ NetworkManager-0.4/src/NetworkManagerDevice.c	2005-06-13 11:21:48.000000000 -0400
-@@ -2670,6 +2670,8 @@
+@@ -2670,6 +2670,9 @@
  	else
  	{
  		/* Manually set up the device */
 +		nm_system_device_clear_ip4_nameservers (dev);
 +		nm_system_device_clear_domain_searches (dev);
  		success = nm_system_device_setup_static_ip4_config (dev);
++		nm_device_update_ip4_address (dev);
  	}
  
 --- NetworkManager-0.4/src/NetworkManagerSystem.h.static-ip-nameservers	2005-06-13 11:06:25.000000000 -0400


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/FC-4/NetworkManager.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- NetworkManager.spec	13 Jun 2005 14:44:15 -0000	1.53
+++ NetworkManager.spec	15 Jun 2005 19:44:55 -0000	1.54
@@ -209,6 +209,10 @@
 
 
 %changelog
+* Wed Jun 15 2005 Dan Williams <dcbw at redhat.com> - 0.4-17.cvs20050404
+- Fix static IP configuration to not segfault NetworkManager
+- Update NM's idea of the IP address after static config
+
 * Fri Jun 10 2005 Dan Williams <dcbw at redhat.com> - 0.4-16.cvs20050404
 - Pick up nameservers from the active network profile if using static IP
 - Fix double-escape of ESSID which would lead to applet not knowing the current