First phase of fixing https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7380 :

Add a new name resolution option: whether or not use the configured (in the OS)
name resolver (e.g., DNS) to resolve network names.  When this option is disabled
but network name resolution is enabled then Wireshark will resolve only those
names that it can from local sources.  This includes (at least, AFAIK):

- name resolutions that Wireshark picks up on from DNS packets it decodes
- the "user hosts file" (~/.wireshark/hosts on *NIX)
- what Wireshark reads out of capture file (the PCAPNG name resolution block)

This new preference defaults to "use external resolvers" for backward
compatibility (so people turning on network name resolution will get the old
behavior).

This option can be set via Edit->Preferences and on the command line; there
remain several UIs (e.g., the "open capture file" dialog, the
View->Name Resolution menu, etc.) that don't have the new option yet.


Also expand on the "description" for the name resolution preferences: these
are used not only in the tooltips but are also written to the preferences
file.  The previous text didn't include enough context when written do the
preferences file.

svn path=/trunk/; revision=43605

1 files changed, 3 insertions, 3 deletions

diff --git a/epan/oids.c b/epan/oids.c
index 13b284398e..e2452560ab 100644
--- a/epan/oids.c
+++ b/epan/oids.c
@@ -799,15 +799,15 @@ void oid_pref_init(module_t *nameres)
 #else
     prefs_register_static_text_preference(nameres, "load_smi_modules_static",
                             "Enable OID resolution: N/A", 
-                            "Support for this feature was not compiled into this version of Wireshark");
+                            "Support for OID resolution was not compiled into this version of Wireshark");
 
     prefs_register_static_text_preference(nameres, "suppress_smi_errors_static",
                             "Suppress SMI errors: N/A", 
-                            "Support for this feature was not compiled into this version of Wireshark");
+                            "Support for OID resolution was not compiled into this version of Wireshark");
 
     prefs_register_static_text_preference(nameres, "smi_module_path",
                             "SMI (MIB and PIB) modules and paths: N/A", 
-                            "Support for this feature was not compiled into this version of Wireshark");
+                            "Support for OID resolution was not compiled into this version of Wireshark");
 #endif
 }