From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 27 Jul 2018 10:34:23 +0000 (+0200)
Subject: swanctl: Report PPK configuration in --list-conns
X-Git-Tag: 5.7.0rc1~19^2~11
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=1fb46f71196edd8176041757d639cdb429625605;p=thirdparty%2Fstrongswan.git

swanctl: Report PPK configuration in --list-conns
---

diff --git a/src/swanctl/commands/list_conns.c b/src/swanctl/commands/list_conns.c
index ce903e50d1..5f7dd8189a 100644
--- a/src/swanctl/commands/list_conns.c
+++ b/src/swanctl/commands/list_conns.c
@@ -238,7 +238,7 @@ CALLBACK(conns, int,
 	void *null, vici_res_t *res, char *name)
 {
 	int ret;
-	char *version, *reauth_time, *rekey_time, *dpd_delay;
+	char *version, *reauth_time, *rekey_time, *dpd_delay, *ppk_id, *ppk_req;
 	hashtable_t *ike;
 
 	version     = vici_find_str(res, "", "%s.version", name);
@@ -282,6 +282,14 @@ CALLBACK(conns, int,
 	}
 	printf("\n");
 
+	ppk_id = vici_find_str(res, NULL, "%s.ppk_id", name);
+	ppk_req = vici_find_str(res, NULL, "%s.ppk_required", name);
+	if (ppk_id || ppk_req)
+	{
+		printf("  ppk: %s%s%srequired\n", ppk_id ?: "", ppk_id ? ", " : "",
+			   !ppk_req || !streq(ppk_req, "yes") ? "not " : "");
+	}
+
 	ret = vici_parse_cb(res, conn_sn, NULL, conn_list, ike);
 	free_hashtable(ike);
 	return ret;