diff options
| author | Martin Willi <martin@revosec.ch> | 2012-05-02 11:12:31 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-05-02 11:12:31 +0200 |
| commit | b24be29646442210f43b100d2282b6c0a0e52e09 (patch) | |
| tree | 5cdc2dbda7cb5881c2c2fa7a90ab6729112fd4c4 /src/libcharon/daemon.c | |
| parent | f99d8b10c9f5b5024b4b1e5f5d1e56e2519cdadc (diff) | |
| parent | 8c35f5d460baf0ee7f25669620ee234a0176681f (diff) | |
| download | strongswan-b24be29646442210f43b100d2282b6c0a0e52e09.tar.bz2 strongswan-b24be29646442210f43b100d2282b6c0a0e52e09.tar.xz | |
Merge branch 'ikev1'
Conflicts:
configure.in
man/ipsec.conf.5.in
src/libcharon/encoding/generator.c
src/libcharon/encoding/payloads/notify_payload.c
src/libcharon/encoding/payloads/notify_payload.h
src/libcharon/encoding/payloads/payload.c
src/libcharon/network/receiver.c
src/libcharon/sa/authenticator.c
src/libcharon/sa/authenticator.h
src/libcharon/sa/ikev2/tasks/ike_init.c
src/libcharon/sa/task_manager.c
src/libstrongswan/credentials/auth_cfg.c
Diffstat (limited to 'src/libcharon/daemon.c')
| -rw-r--r-- | src/libcharon/daemon.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libcharon/daemon.c b/src/libcharon/daemon.c index f2c054a12..ee2db3318 100644 --- a/src/libcharon/daemon.c +++ b/src/libcharon/daemon.c @@ -131,6 +131,7 @@ static void destroy(private_daemon_t *this) DESTROY_IF(this->public.ike_sa_manager); DESTROY_IF(this->public.controller); DESTROY_IF(this->public.eap); + DESTROY_IF(this->public.xauth); DESTROY_IF(this->public.backends); DESTROY_IF(this->public.sender); DESTROY_IF(this->public.socket); @@ -276,6 +277,7 @@ private_daemon_t *daemon_create() charon = &this->public; this->public.controller = controller_create(); this->public.eap = eap_manager_create(); + this->public.xauth = xauth_manager_create(); this->public.backends = backend_manager_create(); this->public.socket = socket_manager_create(); this->public.traps = trap_manager_create(); |