On 04/12/2018 12:35 PM, Matt Darfeuille wrote:
>  - Reorder variable assignment
> 

Matt,

I believe that the attached patch is the correct one.

- get_config() verifies that $g_shorewalldir/$PRODUCT.conf exists, so
  it isn't necessary for its callers to do that.

- ensure_config_path() needs to be called prior to calling get_config().
  Once the params and .conf file are sourced, get_config() calls        
  ensure_config_path() again, to handle the case where 'CONFIG_PATH='
  was specified in .conf.

Please verify.

Thanks,
-Tom
-- 
Tom Eastep        \   Q: What do you get when you cross a mobster with
Shoreline,         \     an international standard?
Washington, USA     \ A: Someone who makes you an offer you can't
http://shorewall.org \   understand
                      \_______________________________________________
diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std
index 19c2c75d9..1da224ffb 100644
--- a/Shorewall/lib.cli-std
+++ b/Shorewall/lib.cli-std
@@ -1441,13 +1441,11 @@ remote_capture() # $* = original arguments less the command.
 	    ;;
     esac
 
-    [ -f $g_shorewalldir/${PRODUCT}.conf ] || fatal_error "Missing file: $g_shorewalldir/${PRODUCT}.conf."
-
     g_export=Yes
 
     ensure_config_path
 
-    get_config No
+    get_config Yes
 
     g_haveconfig=Yes
 

Attachment: signature.asc
Description: OpenPGP digital signature

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Shorewall-devel mailing list
Shorewall-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/shorewall-devel

Reply via email to