diff options
author | Martin Willi <martin@revosec.ch> | 2014-09-24 11:17:29 +0200 |
---|---|---|
committer | Martin Willi <martin@revosec.ch> | 2014-09-24 11:17:29 +0200 |
commit | 6fe02dda752cbb2c2389a3367a3b6e04add43425 (patch) | |
tree | 4c34d40922d0848bfa682b4819d983e4ff57c982 /src/frontends/android/jni/libandroidbridge/charonservice.c | |
parent | 2dee0a85a6923da94d669dc5de337dc5ef1806e7 (diff) | |
parent | 575d3ab19a73736bfa25833e1102d3473e5bc25a (diff) | |
download | strongswan-6fe02dda752cbb2c2389a3367a3b6e04add43425.tar.bz2 strongswan-6fe02dda752cbb2c2389a3367a3b6e04add43425.tar.xz |
Merge branch 'systemd'
Introduces a systemd specific charon-systemd IKE daemon based on libcharon.
Uses systemd APIs for startup control and journal logging and a new systemd
service unit using swanctl as configuration backend.
Diffstat (limited to 'src/frontends/android/jni/libandroidbridge/charonservice.c')
-rw-r--r-- | src/frontends/android/jni/libandroidbridge/charonservice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/frontends/android/jni/libandroidbridge/charonservice.c b/src/frontends/android/jni/libandroidbridge/charonservice.c index 32bf28f09..e6c9126d7 100644 --- a/src/frontends/android/jni/libandroidbridge/charonservice.c +++ b/src/frontends/android/jni/libandroidbridge/charonservice.c @@ -543,7 +543,7 @@ static void charonservice_init(JNIEnv *env, jobject service, jobject builder, charonservice = &this->public; lib->plugins->add_static_features(lib->plugins, "androidbridge", features, - countof(features), TRUE); + countof(features), TRUE, NULL, NULL); #ifdef USE_BYOD if (byod) @@ -556,7 +556,7 @@ static void charonservice_init(JNIEnv *env, jobject service, jobject builder, }; lib->plugins->add_static_features(lib->plugins, "android-byod", - byod_features, countof(byod_features), TRUE); + byod_features, countof(byod_features), TRUE, NULL, NULL); } #endif } |