osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

On OS X, prepend /usr/share/snmp/mibs to the SMI path. Partial fix for 

bug 3163.

svn path=/trunk/; revision=30951
This commit is contained in:
Gerald Combs 2009-11-13 17:55:55 +00:00
parent 8b42b795e8
commit a3fb8e9a74
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
epan/oids.c
View File

@ -547,20 +547,17 @@ static void register_mibs(void) {
return;
}
smi_errors = g_string_new("");
smiSetErrorHandler(smi_error_handler);
path_str = oid_get_default_mib_path();
D(1,("SMI Path: '%s'",path_str));
smiSetPath(path_str);
smi_errors = g_string_new("");
smiSetErrorHandler(smi_error_handler);
for(i=0;i<num_smi_modules;i++) {
if (!smi_modules[i].name) continue;
if (smiIsLoaded(smi_modules[i].name)) {
continue;
} else {
@ -1081,6 +1078,12 @@ oid_get_default_mib_path(void) {
#else
#define PATH_SEPARATOR ":"
path = smiGetPath();
#ifdef __APPLE__
g_string_append(path_str, "/usr/share/snmp/mibs");
if (strlen(path) > 0 ) {
g_string_append(path_str, PATH_SEPARATOR);
}
#endif
g_string_append_printf(path_str, "%s", path);
free (path);
#endif