extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-22 14:20:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move SHOREWALL_CAPVERSION declaration to lib.cli

Browse Source 
- Make 'shorwall' the default g_program in lib.cli
- Initialize g_tool in lib.cli for shorewall and shorewall6 to
  facilitate use of the library without reading shorewall[6].conf.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-10-19 07:12:49 -07:00
parent b00dc658b2
commit 30066062d1
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Shorewall-core/lib.base
View File

@ -20,15 +20,11 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
# This library contains the code common to all Shorewall components. # This library contains the code common to all Shorewall components except the
# # generated scripts.
# - It is loaded by /sbin/shorewall.
# - It is released as part of Shorewall[6] Lite where it is used by /sbin/shorewall[6]-lite
# and /usr/share/shorewall[6]-lite/shorecap.
# #
SHOREWALL_LIBVERSION=40502 SHOREWALL_LIBVERSION=40509
SHOREWALL_CAPVERSION=40507
[ -n "${g_program:=shorewall}" ] [ -n "${g_program:=shorewall}" ]
@ -49,13 +45,13 @@ case $g_program in
shorewall) shorewall)
g_product="Shorewall" g_product="Shorewall"
g_family=4 g_family=4
g_tool= g_tool=iptables
g_lite= g_lite=
;; ;;
shorewall6) shorewall6)
g_product="Shorewall6" g_product="Shorewall6"
g_family=6 g_family=6
g_tool= g_tool=ip6tables
g_lite= g_lite=
;; ;;
shorewall-lite) shorewall-lite)

7
Shorewall-core/lib.cli
View File

@ -21,9 +21,14 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
# This library contains the command processing code common to /sbin/shorewall[6] and # This library contains the command processing code common to /sbin/shorewall[6] and
# /sbin/shorewall[6]-lite. # /sbin/shorewall[6]-lite. In Shorewall and Shorewall6, the lib.cli-std library is
# loaded after this one and replaces some of the functions declared here.
# #
SHOREWALL_CAPVERSION=40507
[ -n "${g_program:=shorewall}" ]
if [ -z "$g_readrc" ]; then if [ -z "$g_readrc" ]; then
# #
# This is modified by the installer when ${SHAREDIR} <> /usr/share # This is modified by the installer when ${SHAREDIR} <> /usr/share