diff options
| author | Martin Willi <martin@strongswan.org> | 2009-09-08 19:48:34 +0200 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2009-09-10 18:52:42 +0200 |
| commit | 5b03a350fc7093aa6984dfcafede98fbb62809eb (patch) | |
| tree | 0f0ae851da9a7b454913710da1b068afe538f97a /scripts | |
| parent | 6de28173f08e9ab0707698cb97ec54132b03cfd1 (diff) | |
| download | strongswan-5b03a350fc7093aa6984dfcafede98fbb62809eb.tar.bz2 strongswan-5b03a350fc7093aa6984dfcafede98fbb62809eb.tar.xz | |
use NULL to load plugins from default plugin directory
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 1 | ||||
| -rw-r--r-- | scripts/dh_speed.c | 2 | ||||
| -rw-r--r-- | scripts/key2keyid.c | 2 | ||||
| -rw-r--r-- | scripts/keyid2sql.c | 2 | ||||
| -rw-r--r-- | scripts/pubkey_speed.c | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 6c28b948f..8a70d79e2 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,6 +1,5 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan AM_CFLAGS = \ --DIPSEC_PLUGINDIR=\"${plugindir}\" \ -DPLUGINS="\"${libstrongswan_plugins}\"" \ -DSTRONGSWAN_CONF=\"${strongswan_conf}\" diff --git a/scripts/dh_speed.c b/scripts/dh_speed.c index 5a57badb6..80a1d2d30 100644 --- a/scripts/dh_speed.c +++ b/scripts/dh_speed.c @@ -102,7 +102,7 @@ int main(int argc, char *argv[]) } library_init(STRONGSWAN_CONF); - lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, argv[1]); + lib->plugins->load(lib->plugins, NULL, argv[1]); atexit(library_deinit); rounds = atoi(argv[2]); diff --git a/scripts/key2keyid.c b/scripts/key2keyid.c index cc3e0b18b..cd6ebc1ed 100644 --- a/scripts/key2keyid.c +++ b/scripts/key2keyid.c @@ -17,7 +17,7 @@ int main(int argc, char *argv[]) int read; library_init(NULL); - lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, PLUGINS); + lib->plugins->load(lib->plugins, NULL, PLUGINS); atexit(library_deinit); read = fread(buf, 1, sizeof(buf), stdin); diff --git a/scripts/keyid2sql.c b/scripts/keyid2sql.c index bf952170d..2d17c273d 100644 --- a/scripts/keyid2sql.c +++ b/scripts/keyid2sql.c @@ -17,7 +17,7 @@ int main(int argc, char *argv[]) int read, n; library_init(NULL); - lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, PLUGINS); + lib->plugins->load(lib->plugins, NULL, PLUGINS); atexit(library_deinit); read = fread(buf, 1, sizeof(buf), stdin); diff --git a/scripts/pubkey_speed.c b/scripts/pubkey_speed.c index 99075d251..b51de0961 100644 --- a/scripts/pubkey_speed.c +++ b/scripts/pubkey_speed.c @@ -60,7 +60,7 @@ int main(int argc, char *argv[]) } library_init(STRONGSWAN_CONF); - lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, argv[1]); + lib->plugins->load(lib->plugins, NULL, argv[1]); atexit(library_deinit); keydata = chunk_create(buf, 0); |