fix: exec output places string in errors now, darwin was checking out…

…put still
webmeshproj · Nov 7, 2023 · 5ad41cc · 5ad41cc
1 parent fe308e8
commit 5ad41cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/meshnet/system/firewall/firewall_darwin.go b/pkg/meshnet/system/firewall/firewall_darwin.go
@@ -40,7 +40,7 @@ func newFirewall(ctx context.Context, opts *Options) (Firewall, error) {
  // Enable the packet filter
  out, err := common.ExecOutput(context.Background(), "pfctl", "-e")
  if err != nil {
- if strings.Contains(string(out), "pf already enabled") {
+ if strings.Contains(err.Error(), "pf already enabled") {
  return &pfctlFirewall{
  enabledAtStart: true,
  anchorFile: afile,

diff --git a/pkg/meshnet/system/firewall/firewall_freebsd.go b/pkg/meshnet/system/firewall/firewall_freebsd.go
@@ -40,7 +40,7 @@ func newFirewall(ctx context.Context, opts *Options) (Firewall, error) {
  // Enable the packet filter
  out, err := common.ExecOutput(context.Background(), "pfctl", "-e")
  if err != nil {
- if strings.Contains(string(out), "pf already enabled") {
+ if strings.Contains(err.Error(), "pf already enabled") {
  return &pfctlFirewall{
  enabledAtStart: true,
  anchorFile: afile,