sync

40 files changed, 0 insertions, 349 deletions

diff --git a/regress/sbin/ipsecctl/ikedel1.ok b/regress/sbin/ipsecctl/ikedel1.ok
index dfc709c6813..8780c593c66 100644
--- a/regress/sbin/ipsecctl/ikedel1.ok
+++ b/regress/sbin/ipsecctl/ikedel1.ok
@@ -1,8 +1,3 @@
 t IPsec-131.188.33.51-131.188.33.29
-C rms [peer-131.188.33.29]
-C rms [mm-131.188.33.29]
-C rms [am-131.188.33.29]
 C rms [IPsec-131.188.33.51-131.188.33.29]
 C rms [qm-131.188.33.51-131.188.33.29]
-C rms [lid-131.188.33.51]
-C rms [rid-131.188.33.29]
diff --git a/regress/sbin/ipsecctl/ikedel10.ok b/regress/sbin/ipsecctl/ikedel10.ok
index f70ca021c90..18c7fc45d0a 100644
--- a/regress/sbin/ipsecctl/ikedel10.ok
+++ b/regress/sbin/ipsecctl/ikedel10.ok
@@ -1,8 +1,3 @@
 t IPsec-192.168.100.1-192.168.200.1
-C rms [peer-192.168.200.1]
-C rms [mm-192.168.200.1]
-C rms [am-192.168.200.1]
 C rms [IPsec-192.168.100.1-192.168.200.1]
 C rms [qm-192.168.100.1-192.168.200.1]
-C rms [lid-192.168.100.1]
-C rms [rid-192.168.200.1]
diff --git a/regress/sbin/ipsecctl/ikedel11.ok b/regress/sbin/ipsecctl/ikedel11.ok
index d0aa4d6c4ad..05125bc86e4 100644
--- a/regress/sbin/ipsecctl/ikedel11.ok
+++ b/regress/sbin/ipsecctl/ikedel11.ok
@@ -1,16 +1,6 @@
 t IPsec-1.1.1.1-0.0.0.0/0
-C rms [peer-192.168.3.1]
-C rms [mm-192.168.3.1]
-C rms [am-192.168.3.1]
 C rms [IPsec-1.1.1.1-0.0.0.0/0]
 C rms [qm-1.1.1.1-0.0.0.0/0]
-C rms [lid-1.1.1.1]
-C rms [rid-0.0.0.0/0]
 t IPsec-1.1.1.1-0.0.0.0/0
-C rms [peer-192.168.3.1]
-C rms [mm-192.168.3.1]
-C rms [am-192.168.3.1]
 C rms [IPsec-1.1.1.1-0.0.0.0/0]
 C rms [qm-1.1.1.1-0.0.0.0/0]
-C rms [lid-1.1.1.1]
-C rms [rid-0.0.0.0/0]
diff --git a/regress/sbin/ipsecctl/ikedel12.ok b/regress/sbin/ipsecctl/ikedel12.ok
index 586b6d3d5ce..203eae1d767 100644
--- a/regress/sbin/ipsecctl/ikedel12.ok
+++ b/regress/sbin/ipsecctl/ikedel12.ok
@@ -1,25 +1,10 @@
 TO = "{ 2.2.2.0/24, 3.3.3.0/24, 4.4.4.0/24 }"
 t IPsec-1.1.1.1-2.2.2.0/24
-C rms [peer-5.5.5.5]
-C rms [mm-5.5.5.5]
-C rms [am-5.5.5.5]
 C rms [IPsec-1.1.1.1-2.2.2.0/24]
 C rms [qm-1.1.1.1-2.2.2.0/24]
-C rms [lid-1.1.1.1]
-C rms [rid-2.2.2.0/24]
 t IPsec-1.1.1.1-3.3.3.0/24
-C rms [peer-5.5.5.5]
-C rms [mm-5.5.5.5]
-C rms [am-5.5.5.5]
 C rms [IPsec-1.1.1.1-3.3.3.0/24]
 C rms [qm-1.1.1.1-3.3.3.0/24]
-C rms [lid-1.1.1.1]
-C rms [rid-3.3.3.0/24]
 t IPsec-1.1.1.1-4.4.4.0/24
-C rms [peer-5.5.5.5]
-C rms [mm-5.5.5.5]
-C rms [am-5.5.5.5]
 C rms [IPsec-1.1.1.1-4.4.4.0/24]
 C rms [qm-1.1.1.1-4.4.4.0/24]
-C rms [lid-1.1.1.1]
-C rms [rid-4.4.4.0/24]
diff --git a/regress/sbin/ipsecctl/ikedel13.ok b/regress/sbin/ipsecctl/ikedel13.ok
index d19081115eb..ed373eb0e37 100644
--- a/regress/sbin/ipsecctl/ikedel13.ok
+++ b/regress/sbin/ipsecctl/ikedel13.ok
@@ -1,25 +1,10 @@
 FROM = "{ 2.2.2.0/24, 3.3.3.0/24, 4.4.4.0/24 }"
 t IPsec-2.2.2.0/24-1.1.1.1
-C rms [peer-1.1.1.1]
-C rms [mm-1.1.1.1]
-C rms [am-1.1.1.1]
 C rms [IPsec-2.2.2.0/24-1.1.1.1]
 C rms [qm-2.2.2.0/24-1.1.1.1]
-C rms [lid-2.2.2.0/24]
-C rms [rid-1.1.1.1]
 t IPsec-3.3.3.0/24-1.1.1.1
-C rms [peer-1.1.1.1]
-C rms [mm-1.1.1.1]
-C rms [am-1.1.1.1]
 C rms [IPsec-3.3.3.0/24-1.1.1.1]
 C rms [qm-3.3.3.0/24-1.1.1.1]
-C rms [lid-3.3.3.0/24]
-C rms [rid-1.1.1.1]
 t IPsec-4.4.4.0/24-1.1.1.1
-C rms [peer-1.1.1.1]
-C rms [mm-1.1.1.1]
-C rms [am-1.1.1.1]
 C rms [IPsec-4.4.4.0/24-1.1.1.1]
 C rms [qm-4.4.4.0/24-1.1.1.1]
-C rms [lid-4.4.4.0/24]
-C rms [rid-1.1.1.1]
diff --git a/regress/sbin/ipsecctl/ikedel14.ok b/regress/sbin/ipsecctl/ikedel14.ok
index 1b63c6f5aff..c4c89852f3f 100644
--- a/regress/sbin/ipsecctl/ikedel14.ok
+++ b/regress/sbin/ipsecctl/ikedel14.ok
@@ -1,74 +1,29 @@
 FROM = "{ 2.2.2.0/24, 3.3.3.0/24, 4.4.4.0/24 }"
 TO = "{ 5.5.5.0/24, 6.6.6.0/24, 7.7.7.0/24 }"
 t IPsec-2.2.2.0/24-5.5.5.0/24
-C rms [peer-1.1.1.1]
-C rms [mm-1.1.1.1]
-C rms [am-1.1.1.1]
 C rms [IPsec-2.2.2.0/24-5.5.5.0/24]
 C rms [qm-2.2.2.0/24-5.5.5.0/24]
-C rms [lid-2.2.2.0/24]
-C rms [rid-5.5.5.0/24]
 t IPsec-2.2.2.0/24-6.6.6.0/24
-C rms [peer-1.1.1.1]
-C rms [mm-1.1.1.1]
-C rms [am-1.1.1.1]
 C rms [IPsec-2.2.2.0/24-6.6.6.0/24]
 C rms [qm-2.2.2.0/24-6.6.6.0/24]
-C rms [lid-2.2.2.0/24]
-C rms [rid-6.6.6.0/24]
 t IPsec-2.2.2.0/24-7.7.7.0/24
-C rms [peer-1.1.1.1]
-C rms [mm-1.1.1.1]
-C rms [am-1.1.1.1]
 C rms [IPsec-2.2.2.0/24-7.7.7.0/24]
 C rms [qm-2.2.2.0/24-7.7.7.0/24]
-C rms [lid-2.2.2.0/24]
-C rms [rid-7.7.7.0/24]
 t IPsec-3.3.3.0/24-5.5.5.0/24
-C rms [peer-1.1.1.1]
-C rms [mm-1.1.1.1]
-C rms [am-1.1.1.1]
 C rms [IPsec-3.3.3.0/24-5.5.5.0/24]
 C rms [qm-3.3.3.0/24-5.5.5.0/24]
-C rms [lid-3.3.3.0/24]
-C rms [rid-5.5.5.0/24]
 t IPsec-3.3.3.0/24-6.6.6.0/24
-C rms [peer-1.1.1.1]
-C rms [mm-1.1.1.1]
-C rms [am-1.1.1.1]
 C rms [IPsec-3.3.3.0/24-6.6.6.0/24]
 C rms [qm-3.3.3.0/24-6.6.6.0/24]
-C rms [lid-3.3.3.0/24]
-C rms [rid-6.6.6.0/24]
 t IPsec-3.3.3.0/24-7.7.7.0/24
-C rms [peer-1.1.1.1]
-C rms [mm-1.1.1.1]
-C rms [am-1.1.1.1]
 C rms [IPsec-3.3.3.0/24-7.7.7.0/24]
 C rms [qm-3.3.3.0/24-7.7.7.0/24]
-C rms [lid-3.3.3.0/24]
-C rms [rid-7.7.7.0/24]
 t IPsec-4.4.4.0/24-5.5.5.0/24
-C rms [peer-1.1.1.1]
-C rms [mm-1.1.1.1]
-C rms [am-1.1.1.1]
 C rms [IPsec-4.4.4.0/24-5.5.5.0/24]
 C rms [qm-4.4.4.0/24-5.5.5.0/24]
-C rms [lid-4.4.4.0/24]
-C rms [rid-5.5.5.0/24]
 t IPsec-4.4.4.0/24-6.6.6.0/24
-C rms [peer-1.1.1.1]
-C rms [mm-1.1.1.1]
-C rms [am-1.1.1.1]
 C rms [IPsec-4.4.4.0/24-6.6.6.0/24]
 C rms [qm-4.4.4.0/24-6.6.6.0/24]
-C rms [lid-4.4.4.0/24]
-C rms [rid-6.6.6.0/24]
 t IPsec-4.4.4.0/24-7.7.7.0/24
-C rms [peer-1.1.1.1]
-C rms [mm-1.1.1.1]
-C rms [am-1.1.1.1]
 C rms [IPsec-4.4.4.0/24-7.7.7.0/24]
 C rms [qm-4.4.4.0/24-7.7.7.0/24]
-C rms [lid-4.4.4.0/24]
-C rms [rid-7.7.7.0/24]
diff --git a/regress/sbin/ipsecctl/ikedel15.ok b/regress/sbin/ipsecctl/ikedel15.ok
index 4855cbba7f6..207b4cfcb04 100644
--- a/regress/sbin/ipsecctl/ikedel15.ok
+++ b/regress/sbin/ipsecctl/ikedel15.ok
@@ -1,10 +1,3 @@
 t IPsec-10.1.1.0/24-10.1.2.0/24
-C rms [peer-3ffe::1]
-C rms [mm-3ffe::1]
-C rms [am-3ffe::1]
-C rms [sharleena.as10.net-ID]
-C rms [faui31o.informatik.uni-erlangen.de-ID]
 C rms [IPsec-10.1.1.0/24-10.1.2.0/24]
 C rms [qm-10.1.1.0/24-10.1.2.0/24]
-C rms [lid-10.1.1.0/24]
-C rms [rid-10.1.2.0/24]
diff --git a/regress/sbin/ipsecctl/ikedel16.ok b/regress/sbin/ipsecctl/ikedel16.ok
index 1481ad435ad..a7a1ea8969d 100644
--- a/regress/sbin/ipsecctl/ikedel16.ok
+++ b/regress/sbin/ipsecctl/ikedel16.ok
@@ -1,20 +1,6 @@
 t IPsec-10.1.1.0/24-10.1.2.0/24
-C rms [peer-3ffe::29]
-C rms [mm-3ffe::29]
-C rms [am-3ffe::29]
-C rms [sharleena.as10.net-ID]
-C rms [faui31o.informatik.uni-erlangen.de-ID]
 C rms [IPsec-10.1.1.0/24-10.1.2.0/24]
 C rms [qm-10.1.1.0/24-10.1.2.0/24]
-C rms [lid-10.1.1.0/24]
-C rms [rid-10.1.2.0/24]
 t IPsec-3ffe::51-3ffe::29
-C rms [peer-3ffe::29]
-C rms [mm-3ffe::29]
-C rms [am-3ffe::29]
-C rms [sharleena.as10.net-ID]
-C rms [faui31o.informatik.uni-erlangen.de-ID]
 C rms [IPsec-3ffe::51-3ffe::29]
 C rms [qm-3ffe::51-3ffe::29]
-C rms [lid-3ffe::51]
-C rms [rid-3ffe::29]
diff --git a/regress/sbin/ipsecctl/ikedel17.ok b/regress/sbin/ipsecctl/ikedel17.ok
index 630c6d512c4..a7a1ea8969d 100644
--- a/regress/sbin/ipsecctl/ikedel17.ok
+++ b/regress/sbin/ipsecctl/ikedel17.ok
@@ -1,16 +1,6 @@
 t IPsec-10.1.1.0/24-10.1.2.0/24
-C rms [peer-3ffe::29]
-C rms [mm-3ffe::29]
-C rms [am-3ffe::29]
 C rms [IPsec-10.1.1.0/24-10.1.2.0/24]
 C rms [qm-10.1.1.0/24-10.1.2.0/24]
-C rms [lid-10.1.1.0/24]
-C rms [rid-10.1.2.0/24]
 t IPsec-3ffe::51-3ffe::29
-C rms [peer-3ffe::29]
-C rms [mm-3ffe::29]
-C rms [am-3ffe::29]
 C rms [IPsec-3ffe::51-3ffe::29]
 C rms [qm-3ffe::51-3ffe::29]
-C rms [lid-3ffe::51]
-C rms [rid-3ffe::29]
diff --git a/regress/sbin/ipsecctl/ikedel18.ok b/regress/sbin/ipsecctl/ikedel18.ok
index 1b21469ae55..8e108b79298 100644
--- a/regress/sbin/ipsecctl/ikedel18.ok
+++ b/regress/sbin/ipsecctl/ikedel18.ok
@@ -1,18 +1,6 @@
-C rms [Phase 2]
 t IPsec-10.1.2.0/24-10.1.1.0/24
-C rms [peer-3ffe::51]
-C rms [mm-3ffe::51]
-C rms [am-3ffe::51]
 C rms [IPsec-10.1.2.0/24-10.1.1.0/24]
 C rms [qm-10.1.2.0/24-10.1.1.0/24]
-C rms [lid-10.1.2.0/24]
-C rms [rid-10.1.1.0/24]
-C rms [Phase 2]
 t IPsec-3ffe::29-3ffe::51
-C rms [peer-3ffe::51]
-C rms [mm-3ffe::51]
-C rms [am-3ffe::51]
 C rms [IPsec-3ffe::29-3ffe::51]
 C rms [qm-3ffe::29-3ffe::51]
-C rms [lid-3ffe::29]
-C rms [rid-3ffe::51]
diff --git a/regress/sbin/ipsecctl/ikedel19.ok b/regress/sbin/ipsecctl/ikedel19.ok
index f692e9aaba8..57feaa7615b 100644
--- a/regress/sbin/ipsecctl/ikedel19.ok
+++ b/regress/sbin/ipsecctl/ikedel19.ok
@@ -1,8 +1,3 @@
 t IPsec-1.1.1.1-0.0.0.0/0
-C rms [peer-3ffe::1]
-C rms [mm-3ffe::1]
-C rms [am-3ffe::1]
 C rms [IPsec-1.1.1.1-0.0.0.0/0]
 C rms [qm-1.1.1.1-0.0.0.0/0]
-C rms [lid-1.1.1.1]
-C rms [rid-0.0.0.0/0]
diff --git a/regress/sbin/ipsecctl/ikedel2.ok b/regress/sbin/ipsecctl/ikedel2.ok
index a49f502e0ab..207b4cfcb04 100644
--- a/regress/sbin/ipsecctl/ikedel2.ok
+++ b/regress/sbin/ipsecctl/ikedel2.ok
@@ -1,8 +1,3 @@
 t IPsec-10.1.1.0/24-10.1.2.0/24
-C rms [peer-131.188.33.29]
-C rms [mm-131.188.33.29]
-C rms [am-131.188.33.29]
 C rms [IPsec-10.1.1.0/24-10.1.2.0/24]
 C rms [qm-10.1.1.0/24-10.1.2.0/24]
-C rms [lid-10.1.1.0/24]
-C rms [rid-10.1.2.0/24]
diff --git a/regress/sbin/ipsecctl/ikedel20.ok b/regress/sbin/ipsecctl/ikedel20.ok
index d0aa4d6c4ad..05125bc86e4 100644
--- a/regress/sbin/ipsecctl/ikedel20.ok
+++ b/regress/sbin/ipsecctl/ikedel20.ok
@@ -1,16 +1,6 @@
 t IPsec-1.1.1.1-0.0.0.0/0
-C rms [peer-192.168.3.1]
-C rms [mm-192.168.3.1]
-C rms [am-192.168.3.1]
 C rms [IPsec-1.1.1.1-0.0.0.0/0]
 C rms [qm-1.1.1.1-0.0.0.0/0]
-C rms [lid-1.1.1.1]
-C rms [rid-0.0.0.0/0]
 t IPsec-1.1.1.1-0.0.0.0/0
-C rms [peer-192.168.3.1]
-C rms [mm-192.168.3.1]
-C rms [am-192.168.3.1]
 C rms [IPsec-1.1.1.1-0.0.0.0/0]
 C rms [qm-1.1.1.1-0.0.0.0/0]
-C rms [lid-1.1.1.1]
-C rms [rid-0.0.0.0/0]
diff --git a/regress/sbin/ipsecctl/ikedel21.ok b/regress/sbin/ipsecctl/ikedel21.ok
index f2b18e592cd..16e6ac2290f 100644
--- a/regress/sbin/ipsecctl/ikedel21.ok
+++ b/regress/sbin/ipsecctl/ikedel21.ok
@@ -1,8 +1,3 @@
 t IPsec-3ffe::1-3ffe::2
-C rms [peer-3ffe::2]
-C rms [mm-3ffe::2]
-C rms [am-3ffe::2]
 C rms [IPsec-3ffe::1-3ffe::2]
 C rms [qm-3ffe::1-3ffe::2]
-C rms [lid-3ffe::1]
-C rms [rid-3ffe::2]
diff --git a/regress/sbin/ipsecctl/ikedel22.ok b/regress/sbin/ipsecctl/ikedel22.ok
index 4a3ff0aa29a..207b4cfcb04 100644
--- a/regress/sbin/ipsecctl/ikedel22.ok
+++ b/regress/sbin/ipsecctl/ikedel22.ok
@@ -1,8 +1,3 @@
 t IPsec-10.1.1.0/24-10.1.2.0/24
-C rms [peer-3ffe::1]
-C rms [mm-3ffe::1]
-C rms [am-3ffe::1]
 C rms [IPsec-10.1.1.0/24-10.1.2.0/24]
 C rms [qm-10.1.1.0/24-10.1.2.0/24]
-C rms [lid-10.1.1.0/24]
-C rms [rid-10.1.2.0/24]
diff --git a/regress/sbin/ipsecctl/ikedel23.ok b/regress/sbin/ipsecctl/ikedel23.ok
index 108c5f0fbb7..17926ebfae3 100644
--- a/regress/sbin/ipsecctl/ikedel23.ok
+++ b/regress/sbin/ipsecctl/ikedel23.ok
@@ -1,10 +1,3 @@
 t IPsec-3ffe::51-3ffe::29
-C rms [peer-3ffe::29]
-C rms [mm-3ffe::29]
-C rms [am-3ffe::29]
-C rms [sharleena.as10.net-ID]
-C rms [faui31o.informatik.uni-erlangen.de-ID]
 C rms [IPsec-3ffe::51-3ffe::29]
 C rms [qm-3ffe::51-3ffe::29]
-C rms [lid-3ffe::51]
-C rms [rid-3ffe::29]
diff --git a/regress/sbin/ipsecctl/ikedel29.ok b/regress/sbin/ipsecctl/ikedel29.ok
index 2cc46912226..b547b7866ee 100644
--- a/regress/sbin/ipsecctl/ikedel29.ok
+++ b/regress/sbin/ipsecctl/ikedel29.ok
@@ -1,9 +1,3 @@
 t IPsec-3ffe:3::/64-3ffe:4::/64
-C rms [peer-3ffe:2::1]
-C rms [mm-3ffe:2::1]
-C rms [am-3ffe:2::1]
-C rms [noname.my.domain-ID]
 C rms [IPsec-3ffe:3::/64-3ffe:4::/64]
 C rms [qm-3ffe:3::/64-3ffe:4::/64]
-C rms [lid-3ffe:3::/64]
-C rms [rid-3ffe:4::/64]
diff --git a/regress/sbin/ipsecctl/ikedel3.ok b/regress/sbin/ipsecctl/ikedel3.ok
index f058cc60663..8780c593c66 100644
--- a/regress/sbin/ipsecctl/ikedel3.ok
+++ b/regress/sbin/ipsecctl/ikedel3.ok
@@ -1,10 +1,3 @@
 t IPsec-131.188.33.51-131.188.33.29
-C rms [peer-131.188.33.29]
-C rms [mm-131.188.33.29]
-C rms [am-131.188.33.29]
-C rms [sharleena.as10.net-ID]
-C rms [faui31o.informatik.uni-erlangen.de-ID]
 C rms [IPsec-131.188.33.51-131.188.33.29]
 C rms [qm-131.188.33.51-131.188.33.29]
-C rms [lid-131.188.33.51]
-C rms [rid-131.188.33.29]
diff --git a/regress/sbin/ipsecctl/ikedel30.ok b/regress/sbin/ipsecctl/ikedel30.ok
index f2b18e592cd..16e6ac2290f 100644
--- a/regress/sbin/ipsecctl/ikedel30.ok
+++ b/regress/sbin/ipsecctl/ikedel30.ok
@@ -1,8 +1,3 @@
 t IPsec-3ffe::1-3ffe::2
-C rms [peer-3ffe::2]
-C rms [mm-3ffe::2]
-C rms [am-3ffe::2]
 C rms [IPsec-3ffe::1-3ffe::2]
 C rms [qm-3ffe::1-3ffe::2]
-C rms [lid-3ffe::1]
-C rms [rid-3ffe::2]
diff --git a/regress/sbin/ipsecctl/ikedel31.ok b/regress/sbin/ipsecctl/ikedel31.ok
index 54febfd135b..1c5aca87543 100644
--- a/regress/sbin/ipsecctl/ikedel31.ok
+++ b/regress/sbin/ipsecctl/ikedel31.ok
@@ -1,8 +1,3 @@
 t IPsec-3ffe:2::1-::/0
-C rms [peer-3ffe::1]
-C rms [mm-3ffe::1]
-C rms [am-3ffe::1]
 C rms [IPsec-3ffe:2::1-::/0]
 C rms [qm-3ffe:2::1-::/0]
-C rms [lid-3ffe:2::1]
-C rms [rid-::/0]
diff --git a/regress/sbin/ipsecctl/ikedel32.ok b/regress/sbin/ipsecctl/ikedel32.ok
index ed6d2bd0c25..5ac5709c8e3 100644
--- a/regress/sbin/ipsecctl/ikedel32.ok
+++ b/regress/sbin/ipsecctl/ikedel32.ok
@@ -1,8 +1,3 @@
 t IPsec-1.1.1.1-2.2.2.2
-C rms [peer-2.2.2.2]
-C rms [mm-2.2.2.2]
-C rms [am-2.2.2.2]
 C rms [IPsec-1.1.1.1-2.2.2.2]
 C rms [qm-1.1.1.1-2.2.2.2]
-C rms [lid-1.1.1.1]
-C rms [rid-2.2.2.2]
diff --git a/regress/sbin/ipsecctl/ikedel33.ok b/regress/sbin/ipsecctl/ikedel33.ok
index ed6d2bd0c25..5ac5709c8e3 100644
--- a/regress/sbin/ipsecctl/ikedel33.ok
+++ b/regress/sbin/ipsecctl/ikedel33.ok
@@ -1,8 +1,3 @@
 t IPsec-1.1.1.1-2.2.2.2
-C rms [peer-2.2.2.2]
-C rms [mm-2.2.2.2]
-C rms [am-2.2.2.2]
 C rms [IPsec-1.1.1.1-2.2.2.2]
 C rms [qm-1.1.1.1-2.2.2.2]
-C rms [lid-1.1.1.1]
-C rms [rid-2.2.2.2]
diff --git a/regress/sbin/ipsecctl/ikedel34.ok b/regress/sbin/ipsecctl/ikedel34.ok
index 9754bd5de23..04afe03480a 100644
--- a/regress/sbin/ipsecctl/ikedel34.ok
+++ b/regress/sbin/ipsecctl/ikedel34.ok
@@ -1,8 +1,3 @@
 t IPsec-3ffe::1/24-3ffe:2::/24
-C rms [peer-1.2.3.4]
-C rms [mm-1.2.3.4]
-C rms [am-1.2.3.4]
 C rms [IPsec-3ffe::1/24-3ffe:2::/24]
 C rms [qm-3ffe::1/24-3ffe:2::/24]
-C rms [lid-3ffe::1/24]
-C rms [rid-3ffe:2::/24]
diff --git a/regress/sbin/ipsecctl/ikedel35.ok b/regress/sbin/ipsecctl/ikedel35.ok
index cf816a92bef..c51ae76cee5 100644
--- a/regress/sbin/ipsecctl/ikedel35.ok
+++ b/regress/sbin/ipsecctl/ikedel35.ok
@@ -1,8 +1,3 @@
 t IPsec-3ffe:2::/24-3ffe::1/24
-C rms [peer-1.2.3.4]
-C rms [mm-1.2.3.4]
-C rms [am-1.2.3.4]
 C rms [IPsec-3ffe:2::/24-3ffe::1/24]
 C rms [qm-3ffe:2::/24-3ffe::1/24]
-C rms [lid-3ffe:2::/24]
-C rms [rid-3ffe::1/24]
diff --git a/regress/sbin/ipsecctl/ikedel36.ok b/regress/sbin/ipsecctl/ikedel36.ok
index 83fb0c3d68b..3b2e2b11346 100644
--- a/regress/sbin/ipsecctl/ikedel36.ok
+++ b/regress/sbin/ipsecctl/ikedel36.ok
@@ -1,8 +1,3 @@
 t IPsec-3ffe::3-3ffe::4
-C rms [peer-3ffe::1]
-C rms [mm-3ffe::1]
-C rms [am-3ffe::1]
 C rms [IPsec-3ffe::3-3ffe::4]
 C rms [qm-3ffe::3-3ffe::4]
-C rms [lid-3ffe::3]
-C rms [rid-3ffe::4]
diff --git a/regress/sbin/ipsecctl/ikedel37.ok b/regress/sbin/ipsecctl/ikedel37.ok
index 1a7798ff7fa..60ca57f5078 100644
--- a/regress/sbin/ipsecctl/ikedel37.ok
+++ b/regress/sbin/ipsecctl/ikedel37.ok
@@ -1,10 +1,3 @@
 t IPsec-3ffe:1::/64-3ffe:2::/64
-C rms [peer-3ffe::1]
-C rms [mm-3ffe::1]
-C rms [am-3ffe::1]
-C rms [sharleena.as10.net-ID]
-C rms [faui31o.informatik.uni-erlangen.de-ID]
 C rms [IPsec-3ffe:1::/64-3ffe:2::/64]
 C rms [qm-3ffe:1::/64-3ffe:2::/64]
-C rms [lid-3ffe:1::/64]
-C rms [rid-3ffe:2::/64]
diff --git a/regress/sbin/ipsecctl/ikedel38.ok b/regress/sbin/ipsecctl/ikedel38.ok
index f9248a55c92..ecd89fa31b6 100644
--- a/regress/sbin/ipsecctl/ikedel38.ok
+++ b/regress/sbin/ipsecctl/ikedel38.ok
@@ -1,20 +1,6 @@
 t IPsec-3ffe:1::/64-3ffe:2::/64
-C rms [peer-3ffe::29]
-C rms [mm-3ffe::29]
-C rms [am-3ffe::29]
-C rms [sharleena.as10.net-ID]
-C rms [faui31o.informatik.uni-erlangen.de-ID]
 C rms [IPsec-3ffe:1::/64-3ffe:2::/64]
 C rms [qm-3ffe:1::/64-3ffe:2::/64]
-C rms [lid-3ffe:1::/64]
-C rms [rid-3ffe:2::/64]
 t IPsec-3ffe::51-3ffe::29
-C rms [peer-3ffe::29]
-C rms [mm-3ffe::29]
-C rms [am-3ffe::29]
-C rms [sharleena.as10.net-ID]
-C rms [faui31o.informatik.uni-erlangen.de-ID]
 C rms [IPsec-3ffe::51-3ffe::29]
 C rms [qm-3ffe::51-3ffe::29]
-C rms [lid-3ffe::51]
-C rms [rid-3ffe::29]
diff --git a/regress/sbin/ipsecctl/ikedel39.ok b/regress/sbin/ipsecctl/ikedel39.ok
index 79a21ac571c..ecd89fa31b6 100644
--- a/regress/sbin/ipsecctl/ikedel39.ok
+++ b/regress/sbin/ipsecctl/ikedel39.ok
@@ -1,16 +1,6 @@
 t IPsec-3ffe:1::/64-3ffe:2::/64
-C rms [peer-3ffe::29]
-C rms [mm-3ffe::29]
-C rms [am-3ffe::29]
 C rms [IPsec-3ffe:1::/64-3ffe:2::/64]
 C rms [qm-3ffe:1::/64-3ffe:2::/64]
-C rms [lid-3ffe:1::/64]
-C rms [rid-3ffe:2::/64]
 t IPsec-3ffe::51-3ffe::29
-C rms [peer-3ffe::29]
-C rms [mm-3ffe::29]
-C rms [am-3ffe::29]
 C rms [IPsec-3ffe::51-3ffe::29]
 C rms [qm-3ffe::51-3ffe::29]
-C rms [lid-3ffe::51]
-C rms [rid-3ffe::29]
diff --git a/regress/sbin/ipsecctl/ikedel4.ok b/regress/sbin/ipsecctl/ikedel4.ok
index 93a4c2127b8..207b4cfcb04 100644
--- a/regress/sbin/ipsecctl/ikedel4.ok
+++ b/regress/sbin/ipsecctl/ikedel4.ok
@@ -1,10 +1,3 @@
 t IPsec-10.1.1.0/24-10.1.2.0/24
-C rms [peer-131.188.33.29]
-C rms [mm-131.188.33.29]
-C rms [am-131.188.33.29]
-C rms [sharleena.as10.net-ID]
-C rms [faui31o.informatik.uni-erlangen.de-ID]
 C rms [IPsec-10.1.1.0/24-10.1.2.0/24]
 C rms [qm-10.1.1.0/24-10.1.2.0/24]
-C rms [lid-10.1.1.0/24]
-C rms [rid-10.1.2.0/24]
diff --git a/regress/sbin/ipsecctl/ikedel40.ok b/regress/sbin/ipsecctl/ikedel40.ok
index dd123d75240..3589efbf531 100644
--- a/regress/sbin/ipsecctl/ikedel40.ok
+++ b/regress/sbin/ipsecctl/ikedel40.ok
@@ -1,18 +1,6 @@
-C rms [Phase 2]
 t IPsec-3ffe:1::/64-3ffe:2::/64
-C rms [peer-3ffe::51]
-C rms [mm-3ffe::51]
-C rms [am-3ffe::51]
 C rms [IPsec-3ffe:1::/64-3ffe:2::/64]
 C rms [qm-3ffe:1::/64-3ffe:2::/64]
-C rms [lid-3ffe:1::/64]
-C rms [rid-3ffe:2::/64]
-C rms [Phase 2]
 t IPsec-3ffe::29-3ffe::51
-C rms [peer-3ffe::51]
-C rms [mm-3ffe::51]
-C rms [am-3ffe::51]
 C rms [IPsec-3ffe::29-3ffe::51]
 C rms [qm-3ffe::29-3ffe::51]
-C rms [lid-3ffe::29]
-C rms [rid-3ffe::51]
diff --git a/regress/sbin/ipsecctl/ikedel41.ok b/regress/sbin/ipsecctl/ikedel41.ok
index ed6d2bd0c25..5ac5709c8e3 100644
--- a/regress/sbin/ipsecctl/ikedel41.ok
+++ b/regress/sbin/ipsecctl/ikedel41.ok
@@ -1,8 +1,3 @@
 t IPsec-1.1.1.1-2.2.2.2
-C rms [peer-2.2.2.2]
-C rms [mm-2.2.2.2]
-C rms [am-2.2.2.2]
 C rms [IPsec-1.1.1.1-2.2.2.2]
 C rms [qm-1.1.1.1-2.2.2.2]
-C rms [lid-1.1.1.1]
-C rms [rid-2.2.2.2]
diff --git a/regress/sbin/ipsecctl/ikedel42.ok b/regress/sbin/ipsecctl/ikedel42.ok
index ed6d2bd0c25..5ac5709c8e3 100644
--- a/regress/sbin/ipsecctl/ikedel42.ok
+++ b/regress/sbin/ipsecctl/ikedel42.ok
@@ -1,8 +1,3 @@
 t IPsec-1.1.1.1-2.2.2.2
-C rms [peer-2.2.2.2]
-C rms [mm-2.2.2.2]
-C rms [am-2.2.2.2]
 C rms [IPsec-1.1.1.1-2.2.2.2]
 C rms [qm-1.1.1.1-2.2.2.2]
-C rms [lid-1.1.1.1]
-C rms [rid-2.2.2.2]
diff --git a/regress/sbin/ipsecctl/ikedel43.ok b/regress/sbin/ipsecctl/ikedel43.ok
index f2b18e592cd..16e6ac2290f 100644
--- a/regress/sbin/ipsecctl/ikedel43.ok
+++ b/regress/sbin/ipsecctl/ikedel43.ok
@@ -1,8 +1,3 @@
 t IPsec-3ffe::1-3ffe::2
-C rms [peer-3ffe::2]
-C rms [mm-3ffe::2]
-C rms [am-3ffe::2]
 C rms [IPsec-3ffe::1-3ffe::2]
 C rms [qm-3ffe::1-3ffe::2]
-C rms [lid-3ffe::1]
-C rms [rid-3ffe::2]
diff --git a/regress/sbin/ipsecctl/ikedel46.ok b/regress/sbin/ipsecctl/ikedel46.ok
index 4c998523868..d65dd3be123 100644
--- a/regress/sbin/ipsecctl/ikedel46.ok
+++ b/regress/sbin/ipsecctl/ikedel46.ok
@@ -1,16 +1,6 @@
 t IPsec-1.1.1.1-2.2.2.2
-C rms [peer-2.2.2.2]
-C rms [mm-2.2.2.2]
-C rms [am-2.2.2.2]
 C rms [IPsec-1.1.1.1-2.2.2.2]
 C rms [qm-1.1.1.1-2.2.2.2]
-C rms [lid-1.1.1.1]
-C rms [rid-2.2.2.2]
 t IPsec-1.1.1.1-2.2.2.2
-C rms [peer-2.2.2.2]
-C rms [mm-2.2.2.2]
-C rms [am-2.2.2.2]
 C rms [IPsec-1.1.1.1-2.2.2.2]
 C rms [qm-1.1.1.1-2.2.2.2]
-C rms [lid-1.1.1.1]
-C rms [rid-2.2.2.2]
diff --git a/regress/sbin/ipsecctl/ikedel47.ok b/regress/sbin/ipsecctl/ikedel47.ok
index 63a60eb9522..193e409b8e2 100644
--- a/regress/sbin/ipsecctl/ikedel47.ok
+++ b/regress/sbin/ipsecctl/ikedel47.ok
@@ -1,10 +1,6 @@
 t IPsec-0.0.0.0/0-0.0.0.0/0
 C rms [IPsec-0.0.0.0/0-0.0.0.0/0]
 C rms [qm-0.0.0.0/0-0.0.0.0/0]
-C rms [lid-0.0.0.0/0]
-C rms [rid-0.0.0.0/0]
 t IPsec-::/0-::/0
 C rms [IPsec-::/0-::/0]
 C rms [qm-::/0-::/0]
-C rms [lid-::/0]
-C rms [rid-::/0]
diff --git a/regress/sbin/ipsecctl/ikedel5.ok b/regress/sbin/ipsecctl/ikedel5.ok
index 99ce28b1c77..5cfef92702c 100644
--- a/regress/sbin/ipsecctl/ikedel5.ok
+++ b/regress/sbin/ipsecctl/ikedel5.ok
@@ -1,20 +1,6 @@
 t IPsec-10.1.1.0/24-10.1.2.0/24
-C rms [peer-131.188.33.29]
-C rms [mm-131.188.33.29]
-C rms [am-131.188.33.29]
-C rms [sharleena.as10.net-ID]
-C rms [faui31o.informatik.uni-erlangen.de-ID]
 C rms [IPsec-10.1.1.0/24-10.1.2.0/24]
 C rms [qm-10.1.1.0/24-10.1.2.0/24]
-C rms [lid-10.1.1.0/24]
-C rms [rid-10.1.2.0/24]
 t IPsec-131.188.33.51-131.188.33.29
-C rms [peer-131.188.33.29]
-C rms [mm-131.188.33.29]
-C rms [am-131.188.33.29]
-C rms [sharleena.as10.net-ID]
-C rms [faui31o.informatik.uni-erlangen.de-ID]
 C rms [IPsec-131.188.33.51-131.188.33.29]
 C rms [qm-131.188.33.51-131.188.33.29]
-C rms [lid-131.188.33.51]
-C rms [rid-131.188.33.29]
diff --git a/regress/sbin/ipsecctl/ikedel6.ok b/regress/sbin/ipsecctl/ikedel6.ok
index 36ab0e1cf65..5cfef92702c 100644
--- a/regress/sbin/ipsecctl/ikedel6.ok
+++ b/regress/sbin/ipsecctl/ikedel6.ok
@@ -1,16 +1,6 @@
 t IPsec-10.1.1.0/24-10.1.2.0/24
-C rms [peer-131.188.33.29]
-C rms [mm-131.188.33.29]
-C rms [am-131.188.33.29]
 C rms [IPsec-10.1.1.0/24-10.1.2.0/24]
 C rms [qm-10.1.1.0/24-10.1.2.0/24]
-C rms [lid-10.1.1.0/24]
-C rms [rid-10.1.2.0/24]
 t IPsec-131.188.33.51-131.188.33.29
-C rms [peer-131.188.33.29]
-C rms [mm-131.188.33.29]
-C rms [am-131.188.33.29]
 C rms [IPsec-131.188.33.51-131.188.33.29]
 C rms [qm-131.188.33.51-131.188.33.29]
-C rms [lid-131.188.33.51]
-C rms [rid-131.188.33.29]
diff --git a/regress/sbin/ipsecctl/ikedel7.ok b/regress/sbin/ipsecctl/ikedel7.ok
index 20c5da44aff..c09888d0fb9 100644
--- a/regress/sbin/ipsecctl/ikedel7.ok
+++ b/regress/sbin/ipsecctl/ikedel7.ok
@@ -1,18 +1,6 @@
-C rms [Phase 2]
 t IPsec-10.1.2.0/24-10.1.1.0/24
-C rms [peer-131.188.33.51]
-C rms [mm-131.188.33.51]
-C rms [am-131.188.33.51]
 C rms [IPsec-10.1.2.0/24-10.1.1.0/24]
 C rms [qm-10.1.2.0/24-10.1.1.0/24]
-C rms [lid-10.1.2.0/24]
-C rms [rid-10.1.1.0/24]
-C rms [Phase 2]
 t IPsec-131.188.33.29-131.188.33.51
-C rms [peer-131.188.33.51]
-C rms [mm-131.188.33.51]
-C rms [am-131.188.33.51]
 C rms [IPsec-131.188.33.29-131.188.33.51]
 C rms [qm-131.188.33.29-131.188.33.51]
-C rms [lid-131.188.33.29]
-C rms [rid-131.188.33.51]
diff --git a/regress/sbin/ipsecctl/ikedel8.ok b/regress/sbin/ipsecctl/ikedel8.ok
index 45061394f20..57feaa7615b 100644
--- a/regress/sbin/ipsecctl/ikedel8.ok
+++ b/regress/sbin/ipsecctl/ikedel8.ok
@@ -1,8 +1,3 @@
 t IPsec-1.1.1.1-0.0.0.0/0
-C rms [peer-192.168.3.1]
-C rms [mm-192.168.3.1]
-C rms [am-192.168.3.1]
 C rms [IPsec-1.1.1.1-0.0.0.0/0]
 C rms [qm-1.1.1.1-0.0.0.0/0]
-C rms [lid-1.1.1.1]
-C rms [rid-0.0.0.0/0]
diff --git a/regress/sbin/ipsecctl/ikedel9.ok b/regress/sbin/ipsecctl/ikedel9.ok
index 2bdfa9fe873..580f1204fde 100644
--- a/regress/sbin/ipsecctl/ikedel9.ok
+++ b/regress/sbin/ipsecctl/ikedel9.ok
@@ -1,9 +1,3 @@
 t IPsec-3.3.3.0/24-4.4.4.0/24
-C rms [peer-2.2.2.2]
-C rms [mm-2.2.2.2]
-C rms [am-2.2.2.2]
-C rms [noname.my.domain-ID]
 C rms [IPsec-3.3.3.0/24-4.4.4.0/24]
 C rms [qm-3.3.3.0/24-4.4.4.0/24]
-C rms [lid-3.3.3.0/24]
-C rms [rid-4.4.4.0/24]