denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't require PLUGINDIR to be defined.

Browse Source 
If it is not available, we just load monolithically built plugins.
This commit is contained in:
Tobias Brunner
2012-08-08 15:07:42 +02:00
parent 4e98ca1800
commit a9f169f699
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/plugin_loader.c
+15 -6
View File
@@ -250,8 +250,11 @@ static bool load_plugin(private_plugin_loader_t *this, char *name, char *file,
this->plugins->insert_last(this->plugins, entry); this->plugins->insert_last(this->plugins, entry);
return TRUE; return TRUE;
case NOT_FOUND: case NOT_FOUND:
/* try to load the plugin from a file */ if (file)
break; { /* try to load the plugin from a file */
break;
}
/* fall-through */
default: default:
return FALSE; return FALSE;
} }
@@ -651,16 +654,18 @@ METHOD(plugin_loader_t, load_plugins, bool,
char *token; char *token;
bool critical_failed = FALSE; bool critical_failed = FALSE;
#ifdef PLUGINDIR
if (path == NULL) if (path == NULL)
{ {
path = PLUGINDIR; path = PLUGINDIR;
} }
#endif /* PLUGINDIR */
enumerator = enumerator_create_token(list, " ", " "); enumerator = enumerator_create_token(list, " ", " ");
while (!critical_failed && enumerator->enumerate(enumerator, &token)) while (!critical_failed && enumerator->enumerate(enumerator, &token))
{ {
bool critical = FALSE; bool critical = FALSE;
char file[PATH_MAX]; char buf[PATH_MAX], *file = NULL;
int len; int len;
token = strdup(token); token = strdup(token);
@@ -675,10 +680,14 @@ METHOD(plugin_loader_t, load_plugins, bool,
free(token); free(token);
continue; continue;
} }
if (snprintf(file, sizeof(file), "%s/libstrongswan-%s.so", if (path)
path, token) >= sizeof(file))
{ {
return FALSE; if (snprintf(buf, sizeof(buf), "%s/libstrongswan-%s.so",
path, token) >= sizeof(buf))
{
return FALSE;
}
file = buf;
} }
if (!load_plugin(this, token, file, critical) && critical) if (!load_plugin(this, token, file, critical) && critical)
{ {