diff options
| author | Martin Willi <martin@revosec.ch> | 2015-02-04 11:31:47 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2015-02-20 13:34:54 +0100 |
| commit | a75980c4aaa7a31dc1455a01abbf36547c9c8bf2 (patch) | |
| tree | 5093dc57e2621cad0078594ae2919b7f77827e04 /src/charon-tkm/tests/tests.c | |
| parent | 94eb09ac354c5dfee033a62c93dabf011e9c9747 (diff) | |
| parent | 65566c37caec653bd91f488083f95387e9fbc1f3 (diff) | |
| download | strongswan-a75980c4aaa7a31dc1455a01abbf36547c9c8bf2.tar.bz2 strongswan-a75980c4aaa7a31dc1455a01abbf36547c9c8bf2.tar.xz | |
Merge branch 'tkm-reqid-alloc'
Fixes expires raised by charon-tkm to actually use a proto/dst/SPI tuple to
identify CHILD_SAs.
Diffstat (limited to 'src/charon-tkm/tests/tests.c')
| -rw-r--r-- | src/charon-tkm/tests/tests.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/charon-tkm/tests/tests.c b/src/charon-tkm/tests/tests.c index 80894a133..669f4d500 100644 --- a/src/charon-tkm/tests/tests.c +++ b/src/charon-tkm/tests/tests.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2013 Tobias Brunner - * Copyright (C) 2012 Reto Buerki + * Copyright (C) 2012-2014 Reto Buerki * Copyright (C) 2012 Adrian-Ken Rueegsegger * Hochschule fuer Technik Rapperswil * @@ -53,7 +53,7 @@ static bool test_runner_init(bool init) libhydra_init(); libcharon_init(); lib->settings->set_int(lib->settings, - "test_runner.filelog.stdout.default", 0); + "test-runner.filelog.stdout.default", 0); charon->load_loggers(charon, NULL, FALSE); /* Register TKM specific plugins */ |