diff options
| author | Martin Willi <martin@strongswan.org> | 2009-04-14 10:34:24 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2009-04-14 10:34:24 +0000 |
| commit | a44bb9345f0482b3dace19a27ee40320ddadc75f (patch) | |
| tree | 34d75bd95b2868900213e13c31ddd892d2fd4904 /src/pluto/plutomain.c | |
| parent | 6e5c8d9413234b18a0631cddadd973a9f509708b (diff) | |
| download | strongswan-a44bb9345f0482b3dace19a27ee40320ddadc75f.tar.bz2 strongswan-a44bb9345f0482b3dace19a27ee40320ddadc75f.tar.xz | |
merged multi-auth branch back into trunk
Diffstat (limited to 'src/pluto/plutomain.c')
| -rw-r--r-- | src/pluto/plutomain.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/pluto/plutomain.c b/src/pluto/plutomain.c index b7bb8df98..eedbf2532 100644 --- a/src/pluto/plutomain.c +++ b/src/pluto/plutomain.c @@ -38,6 +38,7 @@ #endif /* CAPABILITIES */ #include <freeswan.h> +#include <settings.h> #include <pfkeyv2.h> #include <pfkey.h> @@ -197,6 +198,9 @@ delete_lock(void) } } +/* settings defined by strongswan.conf */ +settings_t *settings; + /* by default pluto sends certificate requests to its peers */ bool no_cr_send = FALSE; @@ -239,6 +243,9 @@ main(int argc, char **argv) int keep[] = { CAP_NET_ADMIN, CAP_NET_BIND_SERVICE }; #endif /* CAPABILITIES */ + /* getting settings from strongswan.conf */ + settings = settings_create(STRONGSWAN_CONF); + /* handle arguments */ for (;;) { @@ -703,6 +710,7 @@ exit_pluto(int status) free_ifaces(); scx_finalize(); /* finalize and unload PKCS #11 module */ xauth_finalize(); /* finalize and unload XAUTH module */ + settings->destroy(settings); stop_adns(); free_md_pool(); delete_lock(); |