From 9a09a4b4d0147014844991bf693ece35d7b2258c Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sun, 9 Mar 2008 05:15:12 +0000 Subject: [PATCH] 2008-03-09 Dan Williams Patch from Bas Zoetekouw * src/dhcp-manager/nm-dhcp-manager.c - (nm_dhcp_manager_get_ip4_config): handle domain-search option too git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3403 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 7 +++++++ src/dhcp-manager/nm-dhcp-manager.c | 25 +++++++++++++++++++------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ff9cf9d3..a6118030f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-03-09 Dan Williams + + Patch from Bas Zoetekouw + + * src/dhcp-manager/nm-dhcp-manager.c + - (nm_dhcp_manager_get_ip4_config): handle domain-search option too + 2008-03-09 Dan Williams Patch from Bas Zoetekouw diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index 162eb36da..9a1d28ef3 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -842,7 +842,8 @@ nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, guint32 ip4_broadcast = 0; guint32 ip4_gateway = 0; char * hostname = NULL; - char * domain_names = NULL; + char * domain = NULL; + char * search = NULL; char * nameservers = NULL; char * nis_domain = NULL; char * nis_servers = NULL; @@ -915,7 +916,8 @@ nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, hostname = g_hash_table_lookup (device->options, "new_host_name"); nameservers = g_hash_table_lookup (device->options, "new_domain_name_servers"); - domain_names = g_hash_table_lookup (device->options, "new_domain_name"); + domain = g_hash_table_lookup (device->options, "new_domain_name"); + search = g_hash_table_lookup (device->options, "new_domain_search"); nis_domain = g_hash_table_lookup (device->options, "new_nis_domain"); nis_servers = g_hash_table_lookup (device->options, "new_nis_servers"); static_routes = g_hash_table_lookup (device->options, "new_static_routes"); @@ -939,13 +941,24 @@ nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, nm_info (" hostname '%s'", hostname); } - if (domain_names) { - char **searches = g_strsplit (domain_names, " ", 0); + if (domain) { + char **domains = g_strsplit (domain, " ", 0); + char **s; + + for (s = domains; *s; s++) { + nm_info (" domain name '%s'", *s); + nm_ip4_config_add_domain (ip4_config, *s); + } + g_strfreev (domains); + } + + if (search) { + char **searches = g_strsplit (search, " ", 0); char **s; for (s = searches; *s; s++) { - nm_info (" domain name '%s'", *s); - nm_ip4_config_add_domain (ip4_config, *s); + nm_info (" domain search '%s'", *s); + nm_ip4_config_add_search (ip4_config, *s); } g_strfreev (searches); }