extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-21 13:50:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,690 Commits 104 Branches 736 Tags 55 MiB
7b12558249
Commit Graph

5096 Commits

Author SHA1 Message Date
Tom Eastep
60bde6231a Improve interface_is_usable() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-13 13:49:59 -07:00
Tom Eastep
3d575a45bd Re-code interface_is_usable() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-13 11:56:52 -07:00
Tom Eastep
1f621002b7 Ignore 'isusable' on 'enable' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-12 19:38:18 -07:00
Tom Eastep
cd150af790 Update .status file on disable 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-12 07:44:46 -07:00
Tom Eastep
cd98266396 Correct add of default IPv6 route when no gateway specified 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-12 07:15:24 -07:00
Tom Eastep
3d541f50c8 Use "(S)" consistently in column headings. 
- add synonyms so both the singular and plural forms are accepted.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-11 12:42:04 -07:00
Tom Eastep
f77b350a7b Clear the 'balance' table if no balanced providers. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-11 11:28:06 -07:00
Tom Eastep
bed4457e0e Delete jump to 'tproxy' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-11 09:00:09 -07:00
Tom Eastep
2d5269be7b Fix another conditional compilation bug. 
?IF $false
   ?IF $false
      ...
   ?ENDIF
   foo <------- This line is not omitted!
?ENDIF

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-11 07:44:46 -07:00
Tom Eastep
a05b3afd7f Eliminate the 'tproxy' chain 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-11 07:42:44 -07:00
Tom Eastep
9e743451f6 Add FORMAT 2 to tcrules files. Initialize $format in Tc.pm 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-11 07:08:06 -07:00
Tom Eastep
cb7fc31f0b Restore 4.5.3 compatibility 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-10 14:23:33 -07:00
Tom Eastep
69d735ea0a Make TPROXY actually work! 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-10 11:19:23 -07:00
Tom Eastep
4d4fc315e0 More TPROXY changes 
- Combine identical DIVERT chains.
- Add --transparent to -m socket
- Reserve a TPROXY bit in the fwmark

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-10 07:25:07 -07:00
Tom Eastep
820c965b72 Allow Shorewall::Config::in_hex() to accept an argument already expressed in hex. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-09 13:51:49 -07:00
Tom Eastep
605ef6ef86 Tweak to DIVERT plus correct TPROXY in man pages. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-09 13:10:51 -07:00
Tom Eastep
2eb7af23dc Merge branch 'master' into 4.5.3 2012-05-09 10:03:43 -07:00
Tom Eastep
582d025f58 Add DIVERT action to tcrules. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-09 09:41:58 -07:00
Tom Eastep
b55d8c04e4 Do logical->physical mapping in rtrules. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-08 14:52:18 -07:00
Tom Eastep
3b6f5b2d8a Finish alternative balancing 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-08 13:55:13 -07:00
Tom Eastep
6639b3534e Close all input files in Shorewall::Config::cleanup() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-08 08:58:14 -07:00
Tom Eastep
59bf343521 Leave first filename and linenumber on the same line as error text. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-08 08:55:24 -07:00
Tom Eastep
1d6e6b65db Finish a comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-07 17:06:35 -07:00
Tom Eastep
2224fdbc65 Correct help text in compiler.pl 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-07 16:55:51 -07:00
Tom Eastep
fd1d6cf935 Handle default shorewallrc location 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-07 16:55:17 -07:00
Tom Eastep
5d7442e9e9 Correct typo in converted blrules file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-07 12:13:26 -07:00
Tom Eastep
ef90006334 Avoid reference to unitialized variable on bogus FORMAT in interfaces 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-07 12:00:21 -07:00
Tom Eastep
2cbf1e86ad Allow synonyms for column names in alternate specification formats 
- gateway and gateways in the tunnels file
- mark and action in the tcrules file

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-07 11:59:47 -07:00
Tom Eastep
dd8e9ff09d Fix 'COMMENT' along in the tunnels file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-07 11:58:37 -07:00
Tom Eastep
4320150dc4 Add alternate specification in tunnels file ('gateways') 
- Make similar change in tcrules file with 'action'

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-07 07:43:11 -07:00
Tom Eastep
003daec41c Remove a couple of hard-coded '/usr/share' in Shorewall::Config 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-06 17:30:17 -07:00
Tom Eastep
cb159eba2e Add RST action. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-06 12:14:30 -07:00
Tom Eastep
aac00c3cc7 Pop open stack in run_user_exit1 and run_user_exit2 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-05 10:31:55 -07:00
Tom Eastep
cd35b6a13f Modify macro.BLACKLIST to use blacklog when appropriate 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-05 08:56:55 -07:00
Tom Eastep
af228806fc Allow manual changes to be used in macros. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-05 08:56:26 -07:00
Tom Eastep
69f6aae982 Delete extra copy of macro.BLACKLIST 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-05 08:40:25 -07:00
Tom Eastep
1d90ee174c Cleanup of ERROR/WARNING message enhancement. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-04 07:01:08 -07:00
Tom Eastep
097ab853db Apply Tuomo Soini's tunnels patch 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-04 06:18:22 -07:00
Tom Eastep
3e37f47fb5 Print out the include/open stack in WARNING and ERROR messages. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-03 17:17:55 -07:00
Tom Eastep
bd30d59f3d Fix annotated interfaces files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-03 14:09:49 -07:00
Tom Eastep
e4c4900b32 Add recent changes to a couple of config files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-03 12:32:47 -07:00
Tom Eastep
4d23ec2c48 Belatedly document FORMAT-2 interfaces 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-03 10:07:36 -07:00
Tom Eastep
15aa1dae62 Enhancements to the 'refresh' command. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-02 13:48:18 -07:00
Tom Eastep
894931731b Merge branch 'master' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall 2012-05-02 07:04:30 -07:00
Tom Eastep
3333486c9d Another change to Debian startup at boot 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-01 10:55:29 -07:00
Tom Eastep
2dd82a9898 Update Multi-ISP documentation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-01 10:28:12 -07:00
Tom Eastep
45c637ad6b Fix Debian boot startup (again) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-05-01 10:15:39 -07:00
Tom Eastep
731b310359 Use --hashlimit-upto when available. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-30 13:45:09 -07:00
Tom Eastep
35c08c109e Fix IPv4 'reset' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-30 07:54:40 -07:00
Tom Eastep
766771d812 Remove absurd test 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-30 07:48:07 -07:00
Tom Eastep
b9e6349994 Add some comments 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-29 09:07:34 -07:00
Tom Eastep
9efb60c53a Move init.slackware.firewall.sh to Shorewall-core 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-27 16:15:04 -07:00
Tom Eastep
e0570cc35e Install fixes for Slackware 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-27 07:16:11 -07:00
Tom Eastep
9612044933 Make products start automatically at boot on Debian and derivatives 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-25 11:49:22 -07:00
Tom Eastep
c9b4d3d8c8 Add/improve comments. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-25 09:44:08 -07:00
Tom Eastep
dc63efdbfd Use ?INCLUDE in modules files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-25 07:33:40 -07:00
Tom Eastep
d904a2de86 Search and destroy trailing whitespace 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-24 14:52:57 -07:00
Tom Eastep
f860cd037d Change a comment in generate_matrix() to acknowledge 'KLUDGEFREE' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-24 13:34:56 -07:00
Tom Eastep
0f53c3cc7d Convert all interfaces files to format-2 only 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-24 10:53:09 -07:00
Tom Eastep
3bdf703522 Allow TC experts to SAVE/RESTORE all parts of the packet mark 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-24 09:19:38 -07:00
Tom Eastep
dc85d4a844 Do SHA/SHA1 test if $BUILD = $TEST, independent of $DESTDIR 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-24 08:52:17 -07:00
Tom Eastep
a50bb407aa Patch from Roberto 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-21 17:51:54 -07:00
Tom Eastep
f40144f6af Corret tcrules manpages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-21 09:53:00 -07:00
Tom Eastep
0adbdbb101 Add TCP to macro.Amanda 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-20 09:46:13 -07:00
Tom Eastep
34f5838365 Allow multiple GATEWAYS to be listed in the tunnels file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-18 09:28:37 -07:00
Tom Eastep
2b7e5dd9d8 Suppress duplicate option when not KLUDGEFREE 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-17 07:35:37 -07:00
Tom Eastep
44c8ef2ede Correct ill-advised change to push_matches() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-17 07:30:17 -07:00
Tom Eastep
52ebca3fe1 Merge branch '4.5.2' 
Conflicts:
	Shorewall-core/lib.cli
	Shorewall/Perl/Shorewall/Config.pm

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-16 13:47:05 -07:00
Tom Eastep
805166a354 Ressurect LOCKFILE 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-16 07:21:06 -07:00
Tom Eastep
1462fcd351 Synchronize global settings 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-15 09:43:41 -07:00
Tom Eastep
aaab505006 Improve the debuggability of failed assertions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 17:57:49 -07:00
Tom Eastep
63a2a32b4b Suppress trailing whitespace. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 13:50:59 -07:00
Tom Eastep
eb7a21030d Correct Makefiles 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 12:03:51 -07:00
Tom Eastep
1bc03123b9 Delete code to modify Makefile 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 12:03:08 -07:00
Tom Eastep
e6aabec7ef Install correct Makefile 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 12:03:00 -07:00
Tom Eastep
a32ce5c34a Correct Makefiles 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 12:01:37 -07:00
Tom Eastep
fdc4a84a83 Delete code to modify Makefile 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 11:36:08 -07:00
Tom Eastep
d3943ea0fe Install correct Makefile 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 11:17:27 -07:00
Tom Eastep
79b5c38ecb Handle trailing whitespace in Shorewall::Config::read_a_line1() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 10:14:25 -07:00
Tom Eastep
31752d9ee1 Move macro.BLACKLIST to where it belongs 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 08:14:45 -07:00
Tom Eastep
24e2fe4a04 Make options argument to read_a_line manditory 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-14 08:04:28 -07:00
Tom Eastep
f88584b916 Merge branch '4.5.2' 
Conflicts:
	Shorewall-core/configure.pl

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-12 14:48:56 -07:00
Tom Eastep
69a133083c Modify Makefiles for directory relocation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-12 10:15:55 -07:00
Tom Eastep
59d1a57f06 Add the -T option to the load, reload, restart and start commands. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-11 14:28:44 -07:00
Tom Eastep
42950e53cd Use logical add rather than arithmetic add for uniformity 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-11 14:28:09 -07:00
Tom Eastep
ae9f538ef8 Simplify an assertion 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-11 14:27:48 -07:00
Tom Eastep
e880d2fd84 Remove some whitespace 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-11 08:03:02 -07:00
Tom Eastep
e791a63671 Merge branch '4.5.2' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-11 07:13:40 -07:00
Tom Eastep
e263a3c27d Remove redundant logic 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-11 07:11:05 -07:00
Tom Eastep
0b5e30aa7b Fix INCLUDE inside an ?IF ... ?ENDIF 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-10 17:27:47 -07:00
Tom Eastep
07ff3f294d Fix INCLUDE inside an ?IF ... ?ENDIF 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-10 17:27:23 -07:00
Tom Eastep
6ba69c9540 Eliminate read_a_line1() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-10 17:01:38 -07:00
Tom Eastep
5ee554708c Control the proliferation of arguments to read_a_line() by using 
a bit-mapped single argument.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-10 13:51:25 -07:00
Tom Eastep
623e545f09 Don't allow accounting chains to be altered when OPTIMIZE_ACCOUNTING=No 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-09 21:44:44 -07:00
Tom Eastep
74fdd97b14 Warn about not using sections in the accounting file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-09 16:47:56 -07:00
Tom Eastep
2545322163 Cleanup of read_a_line() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-09 16:00:26 -07:00
Tom Eastep
7b511f449f Don't strip comments until after embedded Perl or Shell have been handled. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-09 15:12:13 -07:00
Tom Eastep
94097e2561 Add newlines to embedded multi-line shell and perl 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-08 12:17:00 -07:00
Tom Eastep
50405f57ba Don't suppress whitespace in embedded Perl and Shell 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-08 07:54:03 -07:00
Tom Eastep
860141127a Re-enable '#' in quoted strings within embedded shell and perl 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-08 07:30:46 -07:00
Tom Eastep
f8f599c1db Restore progress message that was inadvertently deleted. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-07 09:34:32 -07:00
Tom Eastep
a2abad3f68 Modify getparams to use the installed shorewallrc file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-07 09:07:07 -07:00
Tom Eastep
c5f44d8737 Move read_a_line() prototype before first use. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-07 07:42:27 -07:00
Tom Eastep
25bca70ff2 Merge branch 'master' into 4.5.2 2012-04-07 07:39:14 -07:00
Tom Eastep
7204220991 Some more fixes to conditional inclusion. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-07 07:16:17 -07:00
Tom Eastep
97cc4930cf Deimplement option leading ? in embedded directives 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-06 16:26:05 -07:00
Tom Eastep
5688dc77a3 Make ?BEGIN PERL end ?END PERL work. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-06 15:58:21 -07:00
Tom Eastep
9dd6f86c55 Use read_a_line() in the embedded_shell() and embedded_perl() functions. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-06 15:46:01 -07:00
Tom Eastep
53395e788d Add a comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-06 11:49:59 -07:00
Tom Eastep
2de64d5820 Remove find_echo() from lib.core 
- Also correct a couple of typos in comments

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-06 08:01:07 -07:00
Tom Eastep
24e115d0f9 Move a comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-06 08:00:20 -07:00
Tom Eastep
29a820b2f2 Make handling of remote configuration data consistent. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-04 11:47:45 -07:00
Tom Eastep
bff3473279 Fix preceding commit -- it missed to cases of absolute pathnames. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-04 09:43:39 -07:00
Tom Eastep
319d07b1d3 Remove more absolute path names 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-04 09:24:48 -07:00
Tom Eastep
38b6dca223 Correct a number of issues with Shorewall-lite 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-04 07:08:02 -07:00
Tom Eastep
24d30275fa Correct syntax errors in the generated script 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-03 17:08:14 -07:00
Tom Eastep
fb428bf564 Don't modify CONFDIR and SHAREDIR in the shell code 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-02 12:39:49 -07:00
Tom Eastep
348c99c7d0 Compiler changes for Shorewall[6]-lite relocation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-02 07:46:38 -07:00
Tom Eastep
a11e2dd452 Correct uninstall scripts 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-02 06:48:23 -07:00
Tom Eastep
85fce606dc Give all config files access to shorewallrc variables. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-01 13:19:38 -07:00
Tom Eastep
bb6e17fd3e Many changes involved in getting a relocated installations to work 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-04-01 10:47:24 -07:00
Tom Eastep
e48e13012c Fix up lib.base during installation 
- Shorewall-core installer creates all necessary directories.
 2012-04-01 08:16:07 -07:00
Tom Eastep
02a68aa436 Look for ./shorewallrc first 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-31 17:40:18 -07:00
Tom Eastep
766370e22a More work on installers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-31 14:42:01 -07:00
Tom Eastep
75b57b926a Revert "Replace lib.base with symbolic link" 
This reverts commit 98f4a1c545.
 2012-03-31 12:57:38 -07:00
Tom Eastep
cf176474ac Merge branch '4.5.2' 
Conflicts:
	Shorewall/Perl/Shorewall/Chains.pm
 2012-03-31 09:44:36 -07:00
Tom Eastep
6ed207aba0 Fix 'dhcp' with 'nets' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-31 09:30:29 -07:00
Tom Eastep
924ec49d09 Add OWNER_NAME_MATCH to do_user 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-30 16:58:38 -07:00
Tom Eastep
a4097b7a02 Correct Typo in setup_null_routing() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-30 16:57:26 -07:00
Tom Eastep
e38fcb2bfc Correct ipset creation and add a WARNING when creating an ipset 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-30 16:56:43 -07:00
Tom Eastep
c3b56d4123 Add BLACKLIST Macro 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-30 16:53:02 -07:00
Tom Eastep
fead683f18 Modify init scripts if ${SHAREDIR} is non-standard 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-30 16:21:37 -07:00
Tom Eastep
98f4a1c545 Replace lib.base with symbolic link 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-30 15:30:04 -07:00
Tom Eastep
f5414d0fd1 Create ${SYSTEMD} if needed. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-30 13:56:59 -07:00
Tom Eastep
15335f8615 Modify CLIs and libs to know where shorewallrc is. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-30 12:02:25 -07:00
Tom Eastep
0d19c99699 Correct default setting of CONFDIR when .shorewallrc is not found 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-28 06:28:53 -07:00
Tom Eastep
c2fa5ae78f Correct typo in install.sh files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-27 20:19:06 -07:00
Tom Eastep
e1e4855211 Rename USR to PREFIX 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-27 07:47:22 -07:00
Tom Eastep
e09457cdf9 Correct Typo in setup_null_routing() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-27 07:46:53 -07:00
Tom Eastep
f2311f1987 Update install scripts to look for .shorewallrc in many places 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 17:01:55 -07:00
Tom Eastep
b31f656d63 Update uninstall scripts for multiple .shorewallrc locations. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 16:19:40 -07:00
Tom Eastep
e641bf7ac2 Correct typo 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 16:01:35 -07:00
Tom Eastep
8a164adf98 Export TMPDIR if it exists in the .shorewallrc file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 15:43:04 -07:00
Tom Eastep
7b9c1d43cd Look in additional places for .shorewallrc 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 15:00:43 -07:00
Tom Eastep
fd82877312 Another fix for init.sh 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 07:49:49 -07:00
Tom Eastep
2518c653af Modify RedHat/Fedora init scripts for shorewallrc. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 07:20:31 -07:00
Tom Eastep
c23deed3a7 Correct syntax error in init.sh 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-26 07:04:21 -07:00
Tom Eastep
dee20c8d74 Add OWNER_NAME_MATCH to do_user 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-25 20:18:20 -07:00
Tom Eastep
ee15baf98c Correct typo in Chains.pm 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-25 12:48:57 -07:00
Tom Eastep
25e7555e80 Correct typo in the compiler 2012-03-25 12:36:25 -07:00
Tom Eastep
9dd9ee614b Correct ipset creation and add a WARNING when creating an ipset 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-25 08:27:28 -07:00
Tom Eastep
8a18dac870 Installer tweaks 
- Give instructions when Shorewall-core installer finds no rc file
- Update help

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-25 07:49:52 -07:00
Tom Eastep
5aed14ffdc Set PRODUCT before processing rc file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-25 07:25:15 -07:00
Tom Eastep
59aab485c3 Handle 'PRODUCT' more gracefully 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-24 22:21:42 -07:00
Tom Eastep
173d29969d Improve shorewallrc variable expansion 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-24 21:34:24 -07:00
Tom Eastep
7390789b5e Add BLACKLIST Macro 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-24 21:33:57 -07:00
Tom Eastep
fc4aaa97c6 Expand variables in shorewallrc 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-24 21:26:20 -07:00
Tom Eastep
217d5e636c Add BLACKLIST Macro 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-24 19:29:27 -07:00
Tom Eastep
eb118e4443 Add shorewallrc files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-24 13:05:39 -07:00
Tom Eastep
f4ed4109c6 Fix LENGTH handling (again) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-23 15:40:48 -07:00
Tom Eastep
398c843643 Concatenate match options when not KLUDGEFREE 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-23 15:40:25 -07:00
Tom Eastep
01d07f55a9 Only include user exit basename in exported progress messages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-20 07:33:32 -07:00
Tom Eastep
a7b10c99da Add some comments to lib.core 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-20 07:17:19 -07:00
Tom Eastep
bdc8cb66bd Correct load_kernel_modules() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-20 07:15:47 -07:00
Tom Eastep
7bc823fb8b Support 'kerneltz' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 15:57:38 -07:00
Tom Eastep
48b7594b64 Delete prog.header* 
- Move functions into lib.core with ?IF ... ?ELSE ... ?END

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 15:56:02 -07:00
Tom Eastep
88b1180817 Support ?IF in copied files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 13:38:24 -07:00
Tom Eastep
8803cd8d3b ?IF improvements 
- Pass line number to make process_conditional more general
- Add debugging output
- Do first_line processing prior to looking for ?

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 12:51:22 -07:00
Tom Eastep
0063de1564 Add capabilities to conditionals 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 11:57:33 -07:00
Tom Eastep
f104596b39 Merge branch '4.5.1' 2012-03-19 10:13:08 -07:00
Tom Eastep
146d66f0aa Don't complain about SHOREWALL_INIT_SCRIPT 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 09:52:55 -07:00
Tom Eastep
0ccb398cec Merge branch '4.5.1' 2012-03-19 09:22:44 -07:00
Tom Eastep
287a44be52 Allow TOS to work on RHEL5 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 09:22:21 -07:00
Tom Eastep
86f3667b82 Correct nested ?IF 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 08:19:32 -07:00
Tom Eastep
962b1cca1f Remove Perl diagnostic 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 07:46:45 -07:00
Tom Eastep
2026fdab6a Correct IPSET_WARNINGS 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 07:44:52 -07:00
Tom Eastep
722e888043 Fix ?IF 
- Allow nested ?IFs to work correctly
- Correct push logic for $ifstack

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 07:38:52 -07:00
Tom Eastep
e3997abfb9 Merge branch '4.5.2' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-19 07:27:53 -07:00
Tom Eastep
710687bbd6 Revert "Move conditional processing to it's own function" 
This reverts commit 8262cff71a.
 2012-03-19 07:23:57 -07:00
Tom Eastep
d4a1e7dba9 Revert "Allow ?IF, ?ELSE and ?ENDIF in copied files" 
This reverts commit 29dd342118.
 2012-03-19 07:23:24 -07:00
Tom Eastep
c7237e5c8e Revert "Move all functions from prog.header* to lib.core" 
This reverts commit f9f557e1c6.
 2012-03-19 07:22:51 -07:00
Tom Eastep
c299c6d61a Revert "Correct spelling" 
This reverts commit 1d021e3701.
 2012-03-19 07:22:29 -07:00
Tom Eastep
6769acc7a7 Revert "Some corrections to conditional inclusion" 
This reverts commit 164d2f5d1b.
 2012-03-19 07:22:07 -07:00
Tom Eastep
df33587395 Revert "Clean up of conditional inclusion." 
This reverts commit 5f3ba4eb40.
 2012-03-19 07:21:36 -07:00
Tom Eastep
508f33a183 Revert "Eliminate prog.header6" 
This reverts commit 60f1004339.
 2012-03-19 07:21:12 -07:00
Tom Eastep
11f970d1c2 Revert "Eliminate prog.header" 
This reverts commit 13bf383ce8.
 2012-03-19 07:20:57 -07:00
Tom Eastep
72e6330ff4 Revert "Add capabilities to ?IF conditionals" 
This reverts commit 0d71c590e4.
 2012-03-19 07:20:31 -07:00
Tom Eastep
5caf68bc31 Remove .project 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-18 19:31:40 -07:00
Tom Eastep
78306e9f5b Don't issue missing SHOREWALL_SHELL warning when compiling for export 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-18 19:30:32 -07:00
Tom Eastep
15ca0fd1f0 Add IPSET_WARNINGS option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-18 19:30:04 -07:00
Tom Eastep
955a9f0051 Correct Steven's issues 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-18 19:10:46 -07:00
Tom Eastep
bd56caf74f Don't issue missing SHOREWALL_SHELL warning when compiling for export 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-18 12:54:53 -07:00
Tom Eastep
5bfd2cc2c9 Remove some WARNINGs 
- Mr Dash4 has decided he doesn't want them after all.
 2012-03-18 12:42:32 -07:00
Tom Eastep
e47ae4f26e Don't issue missing SHOREWALL_SHELL warning when compiling for export 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-18 12:28:26 -07:00
Tom Eastep
56f66bd966 Require the correct PROTO to use a port range in the ADDRESS column of masq 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-18 11:22:37 -07:00
Tom Eastep
6e089fb0e2 Require the correct PROTO to use a port range in the ADDRESS column of masq 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-18 11:21:53 -07:00
Tom Eastep
0d71c590e4 Add capabilities to ?IF conditionals 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-18 08:48:26 -07:00
Tom Eastep
d1661c95d5 Remove .project 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-17 18:29:32 -07:00
Tom Eastep
13bf383ce8 Eliminate prog.header 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-17 18:07:36 -07:00
Tom Eastep
60f1004339 Eliminate prog.header6 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-17 17:51:56 -07:00
Tom Eastep
5f3ba4eb40 Clean up of conditional inclusion. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-17 12:12:32 -07:00
Tom Eastep
164d2f5d1b Some corrections to conditional inclusion 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-17 10:26:36 -07:00
Tom Eastep
1d021e3701 Correct spelling 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-17 09:42:15 -07:00
Tom Eastep
f9f557e1c6 Move all functions from prog.header* to lib.core 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-17 09:35:35 -07:00
Tom Eastep
29dd342118 Allow ?IF, ?ELSE and ?ENDIF in copied files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-17 09:33:40 -07:00
Tom Eastep
8262cff71a Move conditional processing to it's own function 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-17 09:32:56 -07:00
Tom Eastep
b7465262ca Rename MARK/CLASSIFY column to ACTION 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-16 10:09:13 -07:00
Tom Eastep
ab13fbe95e Allow conditional compilation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-16 08:16:12 -07:00
Tom Eastep
f7a2cd4ef1 Correct typos in accounting manpages. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-14 15:34:19 -07:00
Tom Eastep
95e4f8dd91 Fix TOS(tos/mask) in tcrules. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-14 15:34:11 -07:00
Tom Eastep
8e413a7bf0 Fix TOS(tos/mask) in tcrules. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-14 15:33:31 -07:00
Tom Eastep
3e9edcb7e8 Correct typos in accounting manpages. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-14 14:50:25 -07:00
Tom Eastep
4ba88d2e9c Merge branch '4.5.1' 2012-03-14 11:00:56 -07:00
Tom Eastep
aa503e7211 Apply Tuomo Soini's Makefile patch 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-14 10:57:41 -07:00
Tom Eastep
2a67a202b0 Merge branch '4.5.1' 2012-03-13 20:16:01 -07:00
Tom Eastep
7e14777b8f Fix typo 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-13 19:54:58 -07:00
Tom Eastep
c1d0681e17 Correct LENGTH column validation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-13 17:58:18 -07:00
Tom Eastep
98f8edbde5 Apply two patches from Tuomo Soini 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-13 13:27:20 -07:00
Tom Eastep
1dd6a8b291 Document use of chain designators with DSCP and TOS 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-13 13:26:29 -07:00
Tom Eastep
feb5cc0093 Document use of chain designators with DSCP and TOS 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-13 13:25:37 -07:00
Tom Eastep
e3f2c49c7e Remove level of indirection for the 'super' property 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-13 12:23:33 -07:00
Tom Eastep
fecd091078 Remove %zones{option}{nested} 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-13 11:31:13 -07:00
Tom Eastep
e0b360513c Remove a level of indirection for 'complex' zone flag. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-13 09:47:31 -07:00
Tom Eastep
01d99d4873 Move zone mss handling to the Rules File 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-12 15:59:35 -07:00
Tom Eastep
acb2e2a8ab Implement mss= in hosts file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-12 15:14:35 -07:00
Tom Eastep
0223439e2b Don't compile if ${DESTDIR} 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-12 14:02:44 -07:00
Tom Eastep
fa9f8329b5 Apply two patches from Tuomo Soini 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-12 13:57:37 -07:00
Tom Eastep
4ffcd80b02 Don't test compilation if $DESTDIR 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-11 09:49:26 -07:00
Tom Eastep
48570227ba Big cleanup of TOS handling 
- Validate settings/matches
- Allow setting in the tcrules file.
- Deprecate /etc/shorewall[6]/tos
 2012-03-09 16:16:25 -08:00
Tom Eastep
c112f20e17 Tighten editing of LENGTH column(s) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-07 14:07:04 -08:00
Tom Eastep
05f025e422 Don't install isusable script by default 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-07 07:46:53 -08:00
Tom Eastep
3ee9150deb Fix syntax error in the generated script 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-06 09:15:34 -08:00
Tom Eastep
b2842ae8d4 Don't allow reserved variables to be set in params 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-05 15:42:53 -08:00
Tom Eastep
dff5136134 Correct issues with debugging the generated script 
a) Rename DEBUG to g_debug_iptablesb
b) Clear all of the tables prior to handling iptables-restore input.
 2012-03-05 15:21:10 -08:00
Tom Eastep
a84e131115 Fix bug in DSCP implementation. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-03-05 09:50:15 -08:00
Tom Eastep
aab6e67e70 Omit non-default geometry settings from updated shorewall.conf. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-29 12:34:06 -08:00
Tom Eastep
61bf2d5bfd Fix installer 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-25 16:02:20 -08:00
Tom Eastep
016fe4bcf1 Merge branch 'master' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall 
Conflicts:
	Shorewall-core/install.sh
	Shorewall/install.sh

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-25 07:30:07 -08:00
Roberto C. Sanchez
87381a0f65 FIx typos 2012-02-24 23:02:30 -05:00
Tom Eastep
47453a20f7 Tweak to Run-time gateway variables 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-24 09:02:04 -08:00
Tom Eastep
b78d4ca41f Correct typo 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-23 13:54:50 -08:00
Tom Eastep
7273f4d8d4 Implement run-time gateway variables. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-23 13:36:00 -08:00
Tom Eastep
37a3dbb6f6 Don't install SysV init script if systemd is specified. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-23 10:59:10 -08:00
Tom Eastep
c252005e25 Add support for packager's config file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-23 10:07:02 -08:00
Tom Eastep
c975cddfda Correct init script installation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-22 14:51:41 -08:00
Tom Eastep
a6afac0f3c Use standard rpm macros 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-22 13:32:10 -08:00
Tom Eastep
ef850e4537 Use standard rpm macros 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-22 12:40:16 -08:00
Tom Eastep
2624005fa8 Fix FORMAT-2 interfaces 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-21 16:41:56 -08:00
Tom Eastep
20f990f2eb Fix install on SuSE 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-21 14:24:50 -08:00
Tom Eastep
7de961ebfe Fix broken init scripts. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-21 13:16:12 -08:00
Tom Eastep
f6cc44eb6b Rename HOST -> TARGET and BUILD -> HOST 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-21 13:00:09 -08:00
Tom Eastep
3acd01a44d Rename some variables: 
HOST -> TARGET
%initdir -> %shorewall_initdir

Also add %shorewall_target

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-21 12:34:41 -08:00
Tom Eastep
d5af9c360d Implement FORMAT-2 interfaces file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-21 11:23:58 -08:00
Tom Eastep
2137840fec Fix bug in DSCP support 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-20 16:40:11 -08:00
Tom Eastep
ed9e03b095 Correct FEDORA/REDHAT fiasco 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-20 16:11:28 -08:00
Tom Eastep
3180e13719 Require LIBEXEC and LIBPERL to be absolute path names 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-20 12:04:00 -08:00
Tom Eastep
9869b4c068 Rename environmental variables: 
INSTALLSYS => BUILD
TARGET     => HOST

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-20 10:12:52 -08:00
Tom Eastep
8c981e0464 Cleanup of install scripts based on feedback from Mr. Dash4 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-20 10:08:42 -08:00
Tom Eastep
a1ec1dc178 Add DSCP match support 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-20 08:47:48 -08:00
Tom Eastep
e2f4af6e48 Create a Perl-style switch statement to handle irregular entries in 
the tcrules file.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-19 17:28:49 -08:00
Tom Eastep
b1272e8835 Add DSCP target support. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-19 17:04:16 -08:00
Tom Eastep
75d5957020 Unify 'dont_' chain flags 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-19 14:20:09 -08:00
Tom Eastep
1896e56894 Rework some newbie code in add_group_to_zone() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-19 08:39:17 -08:00
Tom Eastep
7cd7f1ebbe Make zone-option hashes and constants global 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-19 08:30:39 -08:00
Tom Eastep
7fef97d92d Fix compiler crash from unknown interface 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-18 10:02:39 -08:00
Tom Eastep
cd3a9854f8 Change ipset flags error to a warning 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-18 08:22:16 -08:00
Tom Eastep
f8057fed88 Correct typo in the modified install scripts. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-18 08:21:50 -08:00
Tom Eastep
6d13069ffb Correct usage text for 'update'. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-18 08:17:52 -08:00
Tom Eastep
59fea1a05d Add a SWITCH column to /etc/shorewall/masq 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-18 08:17:14 -08:00
Tom Eastep
1c7476fe61 Validate SOURCE/DEST fit for ipset flags 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-17 15:46:28 -08:00
Tom Eastep
58f0425d4a Correct a typo in the blrules manpages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-17 15:33:45 -08:00
Tom Eastep
ee7ea4adb9 Unify the supported install script os/distro set. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-17 15:26:02 -08:00
Tom Eastep
8a3f1f7111 Merge branch '4.5.0' 2012-02-17 13:39:22 -08:00
Tom Eastep
33b0821f8d Separate install system from target system in the install.sh scripts 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-17 13:22:06 -08:00
Tom Eastep
29fcb9b08f Apply Simon Mater's patch for LIBEXEC/PERLLIB 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-13 12:57:07 -08:00
Tom Eastep
460efbac77 Merge branch '4.5.0' 2012-02-11 11:36:38 -08:00
Tom Eastep
09078cf6ad Add comments to add_interface_options() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-07 14:20:11 -08:00
Tom Eastep
f5c09a9e2e Restore 'update -b' functionality 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-07 07:40:35 -08:00
Tom Eastep
f4be778b86 Restore 'update -b' functionality 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-07 07:38:07 -08:00
Tom Eastep
bd959884cc Don't require a MARK value on the default class. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-06 14:40:22 -08:00
Tom Eastep
a87a981a2e Merge branch '4.5.0' 2012-02-05 13:19:54 -08:00
Tom Eastep
e8875ae50b Sort emitted param settings in export_params() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-05 10:03:47 -08:00
Tom Eastep
8561bb77ee Delete the BLACKLIST entry in %sections 2012-02-05 09:40:02 -08:00
Tom Eastep
b462503527 Merge branch '4.5.0' 2012-02-05 07:26:39 -08:00
Tom Eastep
7887def6ad Move manpages directories to their respective product directories 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-05 07:09:27 -08:00
Tom Eastep
6cf7a98eeb Move Samples into the corresponding product directory 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-04 17:18:55 -08:00
Tom Eastep
6fb45b159d Merge branch '4.5.0' 2012-02-04 10:52:52 -08:00
Tom Eastep
0b0ab57b66 Correct mask generation in get_routed_networks() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-04 10:30:34 -08:00
Tom Eastep
a25075d3c5 Minor cleanup of Rules file 
- Correct comments
- Delete stale comments
- Simplify a statement in process_rules1()

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-03 10:34:53 -08:00
Tom Eastep
63aaeb37c4 Remove redundant prototype. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-03 10:34:37 -08:00
Tom Eastep
99e0a340b1 Cosmetic changes to Zones.pm source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-03 10:34:30 -08:00
Tom Eastep
b5e3a41e13 Remove redundant logic 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-03 10:34:20 -08:00
Tom Eastep
5c30c236a3 Minor cleanup of Rules file 
- Correct comments
- Delete stale comments
- Simplify a statement in process_rules1()

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-03 09:53:43 -08:00
Tom Eastep
cdf284a4ee Remove redundant prototype. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-03 09:06:20 -08:00
Tom Eastep
57d1b29d1e Cosmetic changes to Zones.pm source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-03 07:29:13 -08:00
Tom Eastep
25031c3a42 Remove redundant logic 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-03 07:21:28 -08:00
Tom Eastep
0c1beb50ae Add 'IMQ Target' capability to tcrules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-02 12:54:00 -08:00
Tom Eastep
ab04a7fb46 Fix comments -- reflect changes done during the irule implementation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-01 13:53:12 -08:00
Tom Eastep
45a1f9df4f Streamline exclusion of the %vserver% pseudo-interface. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-02-01 10:25:26 -08:00
Tom Eastep
3f42b6d76f Merge branch 'master' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall 2012-01-25 20:41:50 -08:00