From 07bafe63873094537a08726809d0b692a2f6a69d Mon Sep 17 00:00:00 2001 From: Heinz Knutzen Date: Tue, 2 Apr 2024 17:40:01 +0200 Subject: [PATCH] Better error message --- go/pkg/pass1/set-zone.go | 5 +++-- go/testdata/bridged.t | 1 + go/testdata/ipv6/bridged_ipv6.t | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/go/pkg/pass1/set-zone.go b/go/pkg/pass1/set-zone.go index 89dcb9bd..928dfdd3 100644 --- a/go/pkg/pass1/set-zone.go +++ b/go/pkg/pass1/set-zone.go @@ -897,8 +897,9 @@ func (c *spoc) inheritNAT0() { continue } else if n, ok := obj.(*network); ok && !n.isAggregate { if n.ipType == bridgedIP && !nat2.identity { - c.err("Must not inherit nat:%s at bridged %s from %s", - tag, n, from2[tag]) + c.err("Must not inherit nat:%s at bridged %s from %s\n"+ + " Use 'nat:%s = { identity; }' to stop inheritance", + tag, n, from2[tag], tag) continue } nat2 = c.adaptNAT(n, tag, nat2) diff --git a/go/testdata/bridged.t b/go/testdata/bridged.t index d06c970a..a2a97828 100644 --- a/go/testdata/bridged.t +++ b/go/testdata/bridged.t @@ -120,6 +120,7 @@ router:bridge = { network:n1/right = { ip = 10.1.1.0/24; } =ERROR= Error: Must not inherit nat:x at bridged network:n1/left from any:a + Use 'nat:x = { identity; }' to stop inheritance =END= ############################################################ diff --git a/go/testdata/ipv6/bridged_ipv6.t b/go/testdata/ipv6/bridged_ipv6.t index 744cc1e6..e20d96ab 100644 --- a/go/testdata/ipv6/bridged_ipv6.t +++ b/go/testdata/ipv6/bridged_ipv6.t @@ -127,6 +127,7 @@ router:bridge = { network:n1/right = { ip = ::a01:100/120; } =ERROR= Error: Must not inherit nat:x at bridged network:n1/left from any:a + Use 'nat:x = { identity; }' to stop inheritance =END= ############################################################