nameres.hosts_file_handling shouldn't affect loading the profile "hosts"

file. That should be loaded no matter what if we have name resolution
enabled.

Add a name resolution test suite. Currently disabled until I can test it
on Windows.

svn path=/trunk/; revision=49657

1 files changed, 5 insertions, 7 deletions

diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 86c5b662fe..68d368d8fb 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -2470,15 +2470,13 @@ host_name_lookup_init(void) {
   }
 
   /*
-   * Load the user's hosts file, if they have one.
+   * Load the user's hosts file no matter what, if they have one.
    */
-  if(!gbl_resolv_flags.load_hosts_file_from_profile_only){
-    hostspath = get_persconffile_path(ENAME_HOSTS, TRUE);
-    if (!read_hosts_file(hostspath) && errno != ENOENT) {
-      report_open_failure(hostspath, errno, FALSE);
-    }
-    g_free(hostspath);
+  hostspath = get_persconffile_path(ENAME_HOSTS, TRUE);
+  if (!read_hosts_file(hostspath) && errno != ENOENT) {
+    report_open_failure(hostspath, errno, FALSE);
   }
+  g_free(hostspath);
   /*
    * Load the global hosts file, if we have one.
    */