From 74878d14157408ef3a4c42f32608dcd5bbf812a1 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 15 Sep 2021 19:13:43 +0200
Subject: ipsec: T3830: set connections.<conn>.remote<suffix>.id to "peer" if
 undefined

Restore "default" behavior from ipsec.conf
---
 data/templates/ipsec/swanctl/peer.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/templates/ipsec/swanctl/peer.tmpl b/data/templates/ipsec/swanctl/peer.tmpl
index 951a1b22c..5d69b3d66 100644
--- a/data/templates/ipsec/swanctl/peer.tmpl
+++ b/data/templates/ipsec/swanctl/peer.tmpl
@@ -42,9 +42,9 @@
 {%   endif %}
         }
         remote {
-{%   if peer_conf.authentication.remote_id is defined %}
+{%   if peer_conf.authentication is defined and peer_conf.authentication.remote_id is defined and peer_conf.authentication.remote_id is not none %}
             id = "{{ peer_conf.authentication.remote_id }}"
-{%   elif peer[0:1] == '@' %}
+{%   else %}
             id = "{{ peer }}"
 {%   endif %}
             auth = {{ 'psk' if peer_conf.authentication.mode == 'pre-shared-secret' else 'pubkey' }}
-- 
cgit v1.2.3