colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2006-01-30 Robert Love <rml@novell.com>

Browse Source 
* src/dhcp-manager/nm-dhcp-manager.c: Pass TRUE for ignore_error in
	  get_ip4_string() for "domain_name".


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1408 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love
2006-01-30 21:01:09 +00:00
committed by Robert Love
parent 569693ce2d
commit aedbd5490f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2006-01-30 Robert Love <rml@novell.com>
* src/dhcp-manager/nm-dhcp-manager.c: Pass TRUE for ignore_error in
get_ip4_string() for "domain_name".
2006-01-30 Robert Love <rml@novell.com> 2006-01-30 Robert Love <rml@novell.com>
* gnome/applet/nm-gconf-wso-wpa-psk.c, gnome/applet/nm-gconf-wso.c, * gnome/applet/nm-gconf-wso-wpa-psk.c, gnome/applet/nm-gconf-wso.c,

4
src/dhcp-manager/nm-dhcp-manager.c
View File

@@ -402,7 +402,7 @@ static gboolean get_ip4_uint32s (NMDHCPManager *manager, NMDevice *dev, const ch
static gboolean get_ip4_string (NMDHCPManager *manager, NMDevice *dev, const char *item, static gboolean get_ip4_string (NMDHCPManager *manager, NMDevice *dev, const char *item,
char **string, gboolean ignore_error) char **string, gboolean ignore_error)
{ {
DBusMessage * message = NULL; DBusMessage * message = NULL;
DBusMessage * reply = NULL; DBusMessage * reply = NULL;
@@ -546,7 +546,7 @@ NMIP4Config * nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, NMActReque
get_ip4_string (manager, dev, "host_name", &hostname, TRUE); get_ip4_string (manager, dev, "host_name", &hostname, TRUE);
get_ip4_uint32s (manager, dev, "domain_name_servers", &ip4_nameservers, &num_ip4_nameservers, FALSE); get_ip4_uint32s (manager, dev, "domain_name_servers", &ip4_nameservers, &num_ip4_nameservers, FALSE);
get_ip4_string (manager, dev, "domain_name", &domain_names, FALSE); get_ip4_string (manager, dev, "domain_name", &domain_names, TRUE);
get_ip4_string (manager, dev, "nis_domain", &nis_domain, TRUE); get_ip4_string (manager, dev, "nis_domain", &nis_domain, TRUE);
get_ip4_uint32s (manager, dev, "nis_servers", &ip4_nis_servers, &num_ip4_nis_servers, TRUE); get_ip4_uint32s (manager, dev, "nis_servers", &ip4_nis_servers, &num_ip4_nis_servers, TRUE);