osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

In init_plugins(), before scanning PLUGIN_DIR : 

do a "stat" on PLUGIN_DIR, /usr/lib/ethereal/plugins/0.8 and
/usr/local/lib/ethereal/plugins/0.8 and compare st_dev and st_ino to be
sure that PLUGIN_DIR is different from the others (and not a symlink which
would cause a "plugin found in multiple directories" warning).

svn path=/trunk/; revision=1588
This commit is contained in:
Olivier Abad 2000-01-31 19:50:58 +00:00
parent 7e49f55670
commit fa8b170ac9
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins.c
View File

@ -1,7 +1,7 @@
/* plugins.c
* plugin routines
*
* $Id: plugins.c,v 1.6 2000/01/29 16:41:14 gram Exp $
* $Id: plugins.c,v 1.7 2000/01/31 19:50:58 oabad Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -426,6 +426,8 @@ plugins_scan_dir(const char *dirname)
void
init_plugins()
{
struct stat std_dir_stat, local_dir_stat, plugin_dir_stat;
if (plugin_list == NULL) /* ensure init_plugins is only run once */
{
plugins_scan_dir(std_plug_dir);
@ -433,7 +435,17 @@ init_plugins()
if ((strcmp(std_plug_dir, PLUGIN_DIR) != 0) &&
(strcmp(local_plug_dir, PLUGIN_DIR) != 0))
{
plugins_scan_dir(PLUGIN_DIR);
if (stat(std_plug_dir, &std_dir_stat) == 0 &&
stat(local_plug_dir, &local_dir_stat) == 0 &&
stat(PLUGIN_DIR, &plugin_dir_stat) == 0)
{
/* check if PLUGIN_DIR is really different from std_dir and local_dir */
if ((plugin_dir_stat.st_dev != std_dir_stat.st_dev ||
plugin_dir_stat.st_ino != std_dir_stat.st_ino) &&
(plugin_dir_stat.st_dev != local_dir_stat.st_dev ||
plugin_dir_stat.st_ino != local_dir_stat.st_ino))
plugins_scan_dir(PLUGIN_DIR);
}
}
if (!user_plug_dir)
{