From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 18 Jun 2019 08:22:57 +0000 (+0200)
Subject: android: Fix remote identity fallback after changing IKE config creation
X-Git-Tag: 5.8.1dr1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07a6e59b1cd2ce1bc66e716dc4caebe120c365b7;p=thirdparty%2Fstrongswan.git

android: Fix remote identity fallback after changing IKE config creation

Fixes: 9486a2e5b0b5 ("ike-cfg: Pass arguments as struct")
---

diff --git a/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.c b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.c
index 05cb599d71..f37d99295d 100644
--- a/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.c
+++ b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.c
@@ -829,7 +829,7 @@ static job_requeue_t initiate(private_android_service_t *this)
 	if (!gateway || gateway->get_type(gateway) == ID_ANY)
 	{
 		DESTROY_IF(gateway);
-		gateway = identification_create_from_string(server);
+		gateway = identification_create_from_string(ike.remote);
 		/* only use this if remote ID was not configured explicitly */
 		auth->add(auth, AUTH_RULE_IDENTITY_LOOSE, TRUE);
 	}