On 09/04/2012 10:11 AM, Tom Eastep wrote:
New Features:
When "-e" is specified and no output script is named on the
run-line, the default script is now "firewall" in the current
working directory.
In my enthusiasm for providing this default, I managed to disallow
specifying a directory name with -e. Patch attached.
-Tom
--
Tom Eastep \ When I die, I want to go like my Grandfather who
Shoreline, \ died peacefully in his sleep. Not screaming like
Washington, USA \ all of the passengers in his car
http://shorewall.net \________________________________________________
commit 5e07ad8caa3ed142e61ea417299c9660e917cf2f
Author: Tom Eastep <[email protected]>
Date: Tue Sep 4 14:05:52 2012 -0700
Allow a directory to be specified with -e.
Signed-off-by: Tom Eastep <[email protected]>
diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std
index 7ee672e..b7300cb 100644
--- a/Shorewall/lib.cli-std
+++ b/Shorewall/lib.cli-std
@@ -665,7 +665,7 @@ compile_command() {
[ -d $file ] && echo " ERROR: $file is a directory" >&2 && exit 2;
;;
2)
- [ -n "$g_shorewalldir" ] && usage 2
+ [ -n "$g_shorewalldir" -a -z "$g_export" ] && usage 2
if [ ! -d $1 ]; then
if [ -e $1 ]; then
@@ -749,7 +749,7 @@ check_command() {
0)
;;
1)
- [ -n "$g_shorewalldir" ] && usage 2
+ [ -n "$g_shorewalldir" -a -z "$g_export" ] && usage 2
if [ ! -d $1 ]; then
if [ -e $1 ]; then
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Shorewall-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-devel
