experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Look for symbols in plugins using instead of for more portable use

Browse source
This commit is contained in:
Olof hagsand 2021-02-25 21:59:33 +01:00
parent 84ac4a1e49
commit c509868345
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/cli/cli_plugin.c
View file

@ -47,6 +47,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#define __USE_GNU /* For RTLD_DEFAULT */
#include <dlfcn.h> #include <dlfcn.h>
#include <dirent.h> #include <dirent.h>
#include <libgen.h> #include <libgen.h>
@ -213,8 +214,6 @@ clixon_str2fn(char *name,
{ {
void *fn = NULL; void *fn = NULL;
/* Reset error */ /* Reset error */
*error = NULL; *error = NULL;
/* Special check for auto-cli. If the virtual callback is used, it should be overwritten later /* Special check for auto-cli. If the virtual callback is used, it should be overwritten later
@ -236,7 +235,9 @@ clixon_str2fn(char *name,
* master plugin if it exists * master plugin if it exists
*/ */
dlerror(); /* Clear any existing error */ dlerror(); /* Clear any existing error */
fn = dlsym(NULL, name); /* RTLD_DEFAULT instead of NULL for linux + FreeBSD:
* Use default search algorithm. Thanks jdl@netgate.com */
fn = dlsym(RTLD_DEFAULT, name);
if ((*error = (char*)dlerror()) == NULL) if ((*error = (char*)dlerror()) == NULL)
return fn; /* If no error we found the address of the callback */ return fn; /* If no error we found the address of the callback */