Changeset 28644

Timestamp:

2011-10-28T01:50:40+02:00 (6 years ago)

Author:

jow

Message:

[backfire] firewall: merge r28628

Location:

branches/backfire/package/firewall

Files:

• Makefile (modified) (1 diff)
• files/lib/core_init.sh (modified) (2 diffs)
• files/lib/fw.sh (modified) (1 diff)

branches/backfire/package/firewall/Makefile

@@ -10 +10 @@
 
 PKG_VERSION:=2
-PKG_RELEASE:=34.4
+PKG_RELEASE:=34.5
 
 include $(INCLUDE_DIR)/package.mk

branches/backfire/package/firewall/files/lib/core_init.sh

@@ -248 +248 @@
                         case "$msrc" in
                                 *.*) fw_get_negation msrc '-s' "$msrc" ;;
-                                *)   fw_get_subnet4 msrc '-s' "$msrc" ;;
+                                *)   fw_get_subnet4 msrc '-s' "$msrc" || break ;;
                         esac
 
@@ -254 +254 @@
                                 case "$mdst" in
                                         *.*) fw_get_negation mdst '-d' "$mdst" ;;
-                                        *)   fw_get_subnet4 mdst '-d' "$mdst" ;;
+                                        *)   fw_get_subnet4 mdst '-d' "$mdst" || break ;;
                                 esac
 

branches/backfire/package/firewall/files/lib/fw.sh

@@ -256 +256 @@
                                 export -n -- "$_var=! $_flag $_ipaddr/${_netmask:-255.255.255.255}" || \
                                 export -n -- "$_var=$_flag $_ipaddr/${_netmask:-255.255.255.255}"
+                        return 0
                 ;;
-                *) export -n -- "$_var=" ;;
-        esac
+        esac
+
+        export -n -- "$_var="
+        return 1
 }