modify local-ID sections for disabled regress tests too

ok hshoexer@

5 files changed, 21 insertions, 21 deletions

diff --git a/regress/sbin/ipsecctl/ike16.ok b/regress/sbin/ipsecctl/ike16.ok
index b3e0098857d..f86a620f459 100644
--- a/regress/sbin/ipsecctl/ike16.ok
+++ b/regress/sbin/ipsecctl/ike16.ok
@@ -4,9 +4,9 @@ C set [peer-3ffe::29]:Address=3ffe::29 force
 C set [peer-3ffe::29]:Configuration=mm-3ffe::29 force
 C set [mm-3ffe::29]:EXCHANGE_TYPE=ID_PROT force
 C add [mm-3ffe::29]:Transforms=3DES-SHA-GRP15-RSA_SIG force
-C set [peer-3ffe::29]:ID=local-ID force
-C set [local-ID]:ID-type=FQDN force
-C set [local-ID]:Name=sharleena.as10.net force
+C set [peer-3ffe::29]:ID=sharleena.as10.net-ID force
+C set [sharleena.as10.net-ID]:ID-type=FQDN force
+C set [sharleena.as10.net-ID]:Name=sharleena.as10.net force
 C set [peer-3ffe::29]:Remote-ID=3ffe::29-ID force
 C set [3ffe::29-ID]:ID-type=FQDN force
 C set [3ffe::29-ID]:Name=faui31o.informatik.uni-erlangen.de force
@@ -30,9 +30,9 @@ C set [peer-3ffe::29]:Address=3ffe::29 force
 C set [peer-3ffe::29]:Configuration=mm-3ffe::29 force
 C set [mm-3ffe::29]:EXCHANGE_TYPE=ID_PROT force
 C add [mm-3ffe::29]:Transforms=AES-SHA-GRP15-RSA_SIG force
-C set [peer-3ffe::29]:ID=local-ID force
-C set [local-ID]:ID-type=FQDN force
-C set [local-ID]:Name=sharleena.as10.net force
+C set [peer-3ffe::29]:ID=sharleena.as10.net-ID force
+C set [sharleena.as10.net-ID]:ID-type=FQDN force
+C set [sharleena.as10.net-ID]:Name=sharleena.as10.net force
 C set [peer-3ffe::29]:Remote-ID=3ffe::29-ID force
 C set [3ffe::29-ID]:ID-type=FQDN force
 C set [3ffe::29-ID]:Name=faui31o.informatik.uni-erlangen.de force
diff --git a/regress/sbin/ipsecctl/ike23.ok b/regress/sbin/ipsecctl/ike23.ok
index 6e87e0a8d8d..4d8807b8f1f 100644
--- a/regress/sbin/ipsecctl/ike23.ok
+++ b/regress/sbin/ipsecctl/ike23.ok
@@ -4,9 +4,9 @@ C set [peer-3ffe::29]:Address=3ffe::29 force
 C set [peer-3ffe::29]:Configuration=mm-3ffe::29 force
 C set [mm-3ffe::29]:EXCHANGE_TYPE=ID_PROT force
 C add [mm-3ffe::29]:Transforms=AES-SHA-GRP15-RSA_SIG force
-C set [peer-3ffe::29]:ID=local-ID force
-C set [local-ID]:ID-type=FQDN force
-C set [local-ID]:Name=sharleena.as10.net force
+C set [peer-3ffe::29]:ID=sharleena.as10.net-ID force
+C set [sharleena.as10.net-ID]:ID-type=FQDN force
+C set [sharleena.as10.net-ID]:Name=sharleena.as10.net force
 C set [peer-3ffe::29]:Remote-ID=3ffe::29-ID force
 C set [3ffe::29-ID]:ID-type=FQDN force
 C set [3ffe::29-ID]:Name=faui31o.informatik.uni-erlangen.de force
diff --git a/regress/sbin/ipsecctl/ike29.ok b/regress/sbin/ipsecctl/ike29.ok
index 1cd78d69812..f6f7452ebd3 100644
--- a/regress/sbin/ipsecctl/ike29.ok
+++ b/regress/sbin/ipsecctl/ike29.ok
@@ -6,9 +6,9 @@ C set [peer-3ffe:2::1]:Address=3ffe:2::1 force
 C set [peer-3ffe:2::1]:Configuration=mm-3ffe:2::1 force
 C set [mm-3ffe:2::1]:EXCHANGE_TYPE=ID_PROT force
 C add [mm-3ffe:2::1]:Transforms=AES-SHA-GRP15-RSA_SIG force
-C set [peer-3ffe:2::1]:ID=local-ID force
-C set [local-ID]:ID-type=FQDN force
-C set [local-ID]:Name=noname.my.domain force
+C set [peer-3ffe:2::1]:ID=noname.my.domain-ID force
+C set [noname.my.domain-ID]:ID-type=FQDN force
+C set [noname.my.domain-ID]:Name=noname.my.domain force
 C set [IPsec-3ffe:3::/64-3ffe:4::/64]:Phase=2 force
 C set [IPsec-3ffe:3::/64-3ffe:4::/64]:ISAKMP-peer=peer-3ffe:2::1 force
 C set [IPsec-3ffe:3::/64-3ffe:4::/64]:Configuration=qm-3ffe:3::/64-3ffe:4::/64 force
diff --git a/regress/sbin/ipsecctl/ike37.ok b/regress/sbin/ipsecctl/ike37.ok
index 7ad638ee1b4..8a4ec0dae6f 100644
--- a/regress/sbin/ipsecctl/ike37.ok
+++ b/regress/sbin/ipsecctl/ike37.ok
@@ -4,9 +4,9 @@ C set [peer-3ffe::1]:Address=3ffe::1 force
 C set [peer-3ffe::1]:Configuration=mm-3ffe::1 force
 C set [mm-3ffe::1]:EXCHANGE_TYPE=ID_PROT force
 C add [mm-3ffe::1]:Transforms=AES-SHA-GRP15-RSA_SIG force
-C set [peer-3ffe::1]:ID=local-ID force
-C set [local-ID]:ID-type=FQDN force
-C set [local-ID]:Name=sharleena.as10.net force
+C set [peer-3ffe::1]:ID=sharleena.as10.net-ID force
+C set [sharleena.as10.net-ID]:ID-type=FQDN force
+C set [sharleena.as10.net-ID]:Name=sharleena.as10.net force
 C set [peer-3ffe::1]:Remote-ID=3ffe::1-ID force
 C set [3ffe::1-ID]:ID-type=FQDN force
 C set [3ffe::1-ID]:Name=faui31o.informatik.uni-erlangen.de force
diff --git a/regress/sbin/ipsecctl/ike38.ok b/regress/sbin/ipsecctl/ike38.ok
index 9f8e3987a89..1b4991d93d3 100644
--- a/regress/sbin/ipsecctl/ike38.ok
+++ b/regress/sbin/ipsecctl/ike38.ok
@@ -4,9 +4,9 @@ C set [peer-3ffe::29]:Address=3ffe::29 force
 C set [peer-3ffe::29]:Configuration=mm-3ffe::29 force
 C set [mm-3ffe::29]:EXCHANGE_TYPE=ID_PROT force
 C add [mm-3ffe::29]:Transforms=3DES-SHA-GRP15-RSA_SIG force
-C set [peer-3ffe::29]:ID=local-ID force
-C set [local-ID]:ID-type=FQDN force
-C set [local-ID]:Name=sharleena.as10.net force
+C set [peer-3ffe::29]:ID=sharleena.as10.net-ID force
+C set [sharleena.as10.net-ID]:ID-type=FQDN force
+C set [sharleena.as10.net-ID]:Name=sharleena.as10.net force
 C set [peer-3ffe::29]:Remote-ID=3ffe::29-ID force
 C set [3ffe::29-ID]:ID-type=FQDN force
 C set [3ffe::29-ID]:Name=faui31o.informatik.uni-erlangen.de force
@@ -30,9 +30,9 @@ C set [peer-3ffe::29]:Address=3ffe::29 force
 C set [peer-3ffe::29]:Configuration=mm-3ffe::29 force
 C set [mm-3ffe::29]:EXCHANGE_TYPE=ID_PROT force
 C add [mm-3ffe::29]:Transforms=AES-SHA-GRP15-RSA_SIG force
-C set [peer-3ffe::29]:ID=local-ID force
-C set [local-ID]:ID-type=FQDN force
-C set [local-ID]:Name=sharleena.as10.net force
+C set [peer-3ffe::29]:ID=sharleena.as10.net-ID force
+C set [sharleena.as10.net-ID]:ID-type=FQDN force
+C set [sharleena.as10.net-ID]:Name=sharleena.as10.net force
 C set [peer-3ffe::29]:Remote-ID=3ffe::29-ID force
 C set [3ffe::29-ID]:ID-type=FQDN force
 C set [3ffe::29-ID]:Name=faui31o.informatik.uni-erlangen.de force