holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity
13,338 Commits 104 Branches 736 Tags 54 MiB
fdc36747ad
Commit Graph

6349 Commits

Author SHA1 Message Date
Tom Eastep
edc30fcc8d Process the params file with SHOREWALL_SHELL 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-29 12:22:00 -07:00
Tom Eastep
85e5669fc7 Rename function interface_up() to interface_enabled() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-27 18:38:22 -07:00
Tom Eastep
055fceb82f Update policy manpages for duel limits 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-22 12:27:27 -07:00
Tom Eastep
f5bdc9e7f4 Allow two limits in the RATE LIMIT columns 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-22 11:21:43 -07:00
Tom Eastep
b60d6dd6e5 Avoid duplicate module loads 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-20 10:42:53 -07:00
Tom Eastep
2784e93307 Load xt_LOG in both helpers files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-19 08:28:36 -07:00
Tom Eastep
90d1e41dcb Correct IPv4 Helpers file 
- Change xt_ULOG to ipt_ULOG

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-19 08:28:29 -07:00
Tom Eastep
49218a4d28 ipt_LOG in helpers file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-15 18:07:09 -07:00
Tom Eastep
e3b10343a5 Change SYSTEMDDIR to SERVICEDIR 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-13 11:56:26 -07:00
Tom Eastep
286bc50bb3 Remove 'optional' from the Universal interfaces file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-13 08:07:14 -07:00
Tom Eastep
42363da458 Add new .service files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-09 10:00:53 -07:00
Tom Eastep
c5074bddb2 Rename the .service files to .service.214 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-09 09:45:52 -07:00
Tom Eastep
12458d111a Adjust the .service files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-08 17:28:22 -07:00
Tom Eastep
815e93e80c Rename SYSTEMD to SYSTEMDDIR 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-07 16:46:16 -07:00
Tom Eastep
3bae6e61cf Eliminate syntax errors in the generated script 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-07 07:53:26 -07:00
Tom Eastep
5204cbc95f Suppress 'No ipsets were saved' warning when SAVE_IPSETS=No 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-07 07:50:12 -07:00
Tom Eastep
ea1b8ac63a Correct handling of empty LOG_BACKEND 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-07 07:34:55 -07:00
Tom Eastep
3206021278 Another round of uninstall fixes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-04 13:50:39 -07:00
Tom Eastep
8571e0dca0 Another round of uninstall fixes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-04 13:29:51 -07:00
Tom Eastep
9dc2bba025 More uninstall corrections. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-04 09:39:03 -07:00
Tom Eastep
2fce05b3ab Correct a couple of errors 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-04 09:11:29 -07:00
Tom Eastep
00b0489047 Implement SANDBOX variable in the installers/uninstallers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-04 07:50:30 -07:00
Tom Eastep
f9a21bd90e Add -n option to the uninstallers. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-03 17:10:36 -07:00
Tom Eastep
8a5e71a56f Implement the -n option in the installers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-03 07:59:41 -07:00
Tom Eastep
483ea3e437 Create INITDIR in -lite installs. 
- Also don't link the init script if it isn't installed.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-02 17:42:08 -07:00
Tom Eastep
2ec3adcc44 Don't link the init script if SYSTEMD is set. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-10-02 16:23:26 -07:00
Tom Eastep
820c769499 Correct silly bug in last change 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-29 07:08:39 -07:00
Tom Eastep
e6b0666ac9 Save ipsets during normal stop (duh) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-28 18:43:11 -07:00
Tom Eastep
2a463e06aa More documentation changes regarding SAVE_IPSETS. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-28 17:10:45 -07:00
Tom Eastep
3174454300 Correct SAVE_IPSETS logic in Config.pm 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-28 14:38:01 -07:00
Tom Eastep
ce1c367d1d Re-commit the fix that saves only the appropriate family 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-28 14:09:20 -07:00
Tom Eastep
3e2c903a41 Revert "Only save ipsets of the proper family" 
This reverts commit b053cab630.
 2014-09-28 13:32:32 -07:00
Tom Eastep
b053cab630 Only save ipsets of the proper family 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-28 12:58:52 -07:00
Tom Eastep
6f7d063921 Remove the target file before saving ipsets in the savesets command 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-28 11:53:52 -07:00
Tom Eastep
3858683e94 Allow saving a specified list of ipsets 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-28 11:19:41 -07:00
Tom Eastep
38a18ac9ac Allow indefinite alternative to 'yes' and 'no' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-27 15:06:18 -07:00
Tom Eastep
a09484356c Support 'yes', 'no, <other> values for simple config options 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-27 07:57:46 -07:00
Tom Eastep
bc8588a68e Fix rule numbers in trace output 
- Don't increment $number needlessly when not tracing

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-27 07:57:09 -07:00
Tom Eastep
10df9d31c4 Correct typo in the actions manpages (4.6.5 s/b 4.6.4). 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-25 14:47:27 -07:00
Tom Eastep
4989f694cd Correct trace output 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-25 14:47:00 -07:00
Tom Eastep
053df2a5fb Go back to original insert_irule() fix. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-25 09:21:20 -07:00
Tom Eastep
976a1f3deb Merge branch '4.6.3' 
Conflicts:
	Shorewall/Perl/Shorewall/Misc.pm
 2014-09-25 08:06:16 -07:00
Tom Eastep
ea40068c10 Fix ADMINISABSENTMINDED=No used with stoppedrules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-25 08:03:35 -07:00
Tom Eastep
56649e2183 Don't compile routestopped during check if there is stoppedrules. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-24 19:24:13 -07:00
Tom Eastep
520d21c056 Another tweak to LOG_BACKEND 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-24 17:12:05 -07:00
Tom Eastep
540eff24aa Correctons to LOG_BACKEND implementation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-24 16:35:41 -07:00
Tom Eastep
580e00dabd Implement LOG_BACKEND option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-24 15:26:13 -07:00
Tom Eastep
4815f7eba3 Correct warning message in stoppedrules processing. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-24 11:05:15 -07:00
Tom Eastep
a7b57ad32c Clarify iptrace logging. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-24 09:14:38 -07:00
Tom Eastep
ba7f88c912 Re-apply 'terminating' changes to the actions manpages. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-23 09:33:57 -07:00
Tom Eastep
7481514a97 Implement the 'terminating' action option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-23 09:29:13 -07:00
Tom Eastep
20c68dddf2 Merge branch 'master' of ssh://server.shorewall.net/home/teastep/shorewall/code 2014-09-23 09:24:44 -07:00
Tom Eastep
35e60aa10c Fix actions manpage 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-23 09:24:32 -07:00
Tom Eastep
1f5439257a Revert "Implement the 'terminating' action option" 
This reverts commit 6851744cb7.
 2014-09-23 07:39:25 -07:00
Tom Eastep
4495ed687b Merge branch 'master' of ssh://git.code.sf.net/p/shorewall/code 2014-09-23 07:10:46 -07:00
Tom Eastep
d97d45f4ad Merge branch '4.6.3' 2014-09-23 07:10:17 -07:00
Tuomo Soini
a03f00bf0f systemd services: multi-user is not same as old runlevel 3 so use basic 
add conflicts to obviously conflicting services
remove old version number from init files
remove legacy syslog.target which is not needed on modern systems
fix formatting of email address onold Copyright text

Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2014-09-23 16:44:03 +03:00
Tuomo Soini
8f05d0f16d install.sh: support install on centos7 and foobar7 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2014-09-23 13:19:09 +03:00
Tom Eastep
f9d98b74a2 Merge branch '4.6.2' into 4.6.3 
Conflicts:
	Shorewall/Perl/Shorewall/Providers.pm

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-16 08:09:20 -07:00
Tom Eastep
0d23b9c542 Don't verify required interfaces during 'stop' or 'clear'. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-14 09:29:04 -07:00
Tom Eastep
a7bdfcc47b Refine the rule reduction fix 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-11 20:58:01 -07:00
Tom Eastep
988ee64621 Eliminate Redundant Rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-11 10:17:01 -07:00
Tom Eastep
9947f4d968 Re-enable SECTION PREROUTING in the accounting file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-10 12:53:08 -07:00
Tom Eastep
9e039e30e5 Issue warning message when /etc/iproute2/rt_tables is not writeable 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-02 08:11:33 -07:00
Tom Eastep
771e487b02 Merge branch '4.6.3' 2014-09-01 09:10:55 -07:00
Tom Eastep
0b66c475a7 Make <command> replacable in the run synopsis 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-01 09:10:03 -07:00
Tom Eastep
8727a6f1d8 Correct 'run' command synopsis in the shorewall[6] manpages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-01 08:52:09 -07:00
Tom Eastep
f9a62e1650 Correct builtin example in the actions manpages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-01 08:29:29 -07:00
Tom Eastep
6851744cb7 Implement the 'terminating' action option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-09-01 08:16:42 -07:00
Tom Eastep
f963adccf5 Correct silly typo in Chains.pm 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-31 16:57:24 -07:00
Tom Eastep
48549b35ac Correct inaccuracy in default.debian 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-30 08:25:58 -07:00
Tom Eastep
9001643996 Merge branch 'master' into 4.6.3 2014-08-30 07:18:55 -07:00
Tom Eastep
4bacfced82 Another attempt to fix formatting 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-24 11:59:51 -07:00
Tom Eastep
7c1bbd4dc7 Fix formatting in shorewall[6]-rules(5) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-24 11:29:44 -07:00
Tom Eastep
4347190f82 Clarify REJECT handling in IP[6]TABLE rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-24 09:10:10 -07:00
Tom Eastep
fa8c3b3b6c Correct typo in error messages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-24 08:34:33 -07:00
Tom Eastep
045d5ac048 Correct typo in error messages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-24 08:34:04 -07:00
Tom Eastep
e4a8cb31ba Clean up the Goto Meeting macro a bit 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-24 08:16:11 -07:00
Tom Eastep
9e6fffc231 Goto-Meeting Macro from Eric Teeter 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-23 16:05:38 -07:00
Tom Eastep
3030219740 Tighten the check for DNSAmp 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-21 10:36:44 -07:00
Tom Eastep
602ecad712 Cleaner code in expand_variables() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-20 11:25:49 -07:00
Tom Eastep
6f777098d7 Add 'wildcard' member to the interface table 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-12 06:51:17 -07:00
Tom Eastep
e545329eb9 Modify the preceding fix to work with wildcard interfaces 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-12 06:50:59 -07:00
Tom Eastep
aedd9b5a76 Add 'wildcard' member to the interface table 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-11 08:30:44 -07:00
Tom Eastep
427f38109e Some cosmetic cleanup 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-10 07:20:23 -07:00
Tom Eastep
0e1a1a3f44 Modify the preceding fix to work with wildcard interfaces 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-08 10:34:29 -07:00
Tom Eastep
b6161b8be7 Merge branch '4.6.2' 2014-08-08 08:30:04 -07:00
Tom Eastep
d3209ca624 Correct handling of a physical name in the provider INTERFACE column 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-08 08:15:26 -07:00
Tom Eastep
34ecbb9074 Correct Cygwin64 detection in the Shorewall installer 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-07 07:17:34 -07:00
Tom Eastep
beb70854ef Correct Cygwin64 detection in the Shorewall installer 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-07 06:40:34 -07:00
Tom Eastep
7030fad572 Revert "Install the core components along with Shorewall" 
This reverts commit c653a04a43.
 2014-08-07 06:36:23 -07:00
Tom Eastep
c653a04a43 Install the core components along with Shorewall 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-06 12:59:12 -07:00
Tom Eastep
5ef5aa8cdb Allow inline matches in an action file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-05 07:34:24 -07:00
Tom Eastep
0ca12bd86f Correct syntax error caused by replacing '%%' with '??' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-03 15:29:58 -07:00
Tom Eastep
a2f1c57246 Add DNSAmp action 
- Allow escaping '@' allowing u32 in action body
- Allow inline matches in actions

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-03 15:11:25 -07:00
Tom Eastep
fd42fa9f74 Make 'detect_configuration' work in the 'run' command 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-08-01 07:34:40 -07:00
Tom Eastep
e49832f4b5 Run the 'init' script in the 'run' command. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-30 10:25:00 -07:00
Tom Eastep
0bf80c15d8 Detect missing <commmand> in the generated scrip 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-29 11:35:32 -07:00
Tom Eastep
4e9a0b989d Update 'run' help text 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-29 10:46:28 -07:00
Tom Eastep
31e5aeeaea Refine the 'run' command 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-29 10:30:07 -07:00
Tom Eastep
eb5026d3b7 Merge branch '4.6.2' 2014-07-28 14:47:23 -07:00
Tom Eastep
a799d74901 Correct typo and link in the shorewall-mangle manpage 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-28 08:39:07 -07:00
Tom Eastep
a7b18ca875 Implement 'run' command 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-28 07:04:56 -07:00
Tom Eastep
ad6c91bcbd Allow optimize level 8 to work with Perl 5.20.0. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-25 21:03:48 -07:00
Tom Eastep
848078873d Update tcfilters manpages to mention BASIC_FILTERS=Yes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-22 07:19:10 -07:00
Tom Eastep
461f7b10ba Detect Arptables JF capability when LOAD_HELPERS_ONLY = No. 
- Move detection of Header Match to its proper ordinal.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-20 07:19:02 -07:00
Tom Eastep
2c9eda9cee Add some white space for readability 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-19 18:33:02 -07:00
Tom Eastep
64fc3d2e43 Correct a typo that caused iset couter match to be mis-detected 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-19 10:27:29 -07:00
Tom Eastep
d0aed87546 Correct IPV6 ipset capabilities checking on 3.14 kernels 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-19 10:25:46 -07:00
Tom Eastep
56fa6bd78a Revert "Correct ipset detection on later kernels." 
This reverts commit b207f64a85.
 2014-07-19 10:22:12 -07:00
Tom Eastep
b207f64a85 Correct ipset detection on later kernels. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-19 08:55:02 -07:00
Tom Eastep
9f381209d5 Detect HEADER_MATCH when LOAD_MODULES_ONLY=No 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-19 07:20:28 -07:00
Tom Eastep
29e6bc9379 Merge branch '4.6.2' of ssh://server.shorewall.net/home/teastep/shorewall/code into 4.6.2 2014-07-18 15:15:33 -07:00
Tom Eastep
4b3196b959 Add refmiscinfo to the shorewall-tcrules manpage 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-18 13:49:30 -07:00
Tom Eastep
6771dc54ad Streamline some code from the last commit 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-18 12:58:49 -07:00
Tom Eastep
ba69708092 Merge branch '4.6.2' of ssh://server.shorewall.net/home/teastep/shorewall/code into 4.6.2 2014-07-18 08:45:06 -07:00
Tom Eastep
417bd0138e Correct two problems with tcrules processing: 
- SAVE and RESTORE didn't work
- '|' and '&' were ignored


Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-18 08:32:22 -07:00
Tom Eastep
a97e2fd3d9 Update manpages regarding 'status -i' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-12 19:37:05 -07:00
Tom Eastep
53dda803e2 More Cygwin64 changes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-09 11:28:45 -07:00
Tom Eastep
cc935009ce Correct install problems under Cygwin 
- configure.pl doesn't understand CYGWIN return from uname
- shorewall-core install.sh doesn't understand CYGWIN return from uname
- shorewall install.sh generates 'mkdir -p //etc/shorewall' which is
  broken under Cygwin

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-09 10:48:03 -07:00
Tom Eastep
a7856e4dd6 Update another copyright 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-06 15:11:16 -07:00
Tom Eastep
4a4cea46c0 Update copyrights in the Sample files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-06 13:44:34 -07:00
Tom Eastep
2ed523101c Allow specification of the MAC address of a gateway 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-06 09:54:53 -07:00
Tom Eastep
c663a14c4d Correct TIME column handling in IPv6 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-04 08:17:19 -07:00
Tom Eastep
8bfff55ed2 Add a TIME column to the mangle file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-04 08:01:14 -07:00
Tom Eastep
b1a6ec7f03 Merge branch '4.6.1' 2014-07-02 21:41:27 -07:00
Tom Eastep
cad8443e01 Allow SAVE/RESTORE rules in the OUTPUT chain 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-02 12:38:02 -07:00
Tom Eastep
2ad81f1a81 Apply Thibaut Chèze's patch for DSCP names 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-02 12:37:50 -07:00
Tom Eastep
166e1a3df9 Allow SAVE/RESTORE rules in the OUTPUT chain 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-01 06:54:54 -07:00
Tom Eastep
84437ea689 Apply Thibaut Chèze's patch for DSCP names 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-07-01 06:52:58 -07:00
Tuomo Soini
87b5751a49 macro.IPMI: add missing ports from Asus, Supermicro, and Dell documentation 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2014-07-01 13:14:01 +03:00
Tuomo Soini
49aada0f9c macro.ILO: add support for HP Integrated Lights-Out 
Signed-off-by: Tuomo Soini <tis@foobar.fi>
 2014-07-01 12:25:26 +03:00
Tom Eastep
7fdc398a5e Revert "Revert "Revert "Add a TIME column to the mangle file""" 
This reverts commit 1165b2689c.
 2014-06-27 08:23:04 -07:00
Tom Eastep
1165b2689c Revert "Revert "Add a TIME column to the mangle file"" 
This reverts commit 9c7fcd09fd.
 2014-06-27 08:14:28 -07:00
Tom Eastep
2701b0a756 Correct number of columns in split_line2() calls. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-06-25 08:22:09 -07:00
Tom Eastep
9c7fcd09fd Revert "Add a TIME column to the mangle file" 
This reverts commit 824b14b714.
 2014-06-25 07:33:42 -07:00
Tom Eastep
80c09c4747 Merge branch '4.6.1' 2014-06-25 07:31:36 -07:00
Tom Eastep
824b14b714 Add a TIME column to the mangle file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-06-25 07:05:12 -07:00
Tom Eastep
122d58b122 Clear inline matches in perl_action_tcp_helper 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-06-21 07:58:27 -07:00
Tom Eastep
61bb73fd8c Correct handling of matches in action_tcp_helper() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-06-20 14:28:17 -07:00
Tom Eastep
ff8d354c1c Allow INLINE_MATCHES=Yes and AUTOHELPERS=No to work correctly. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-06-20 07:01:31 -07:00
Tom Eastep
7b0cf2b665 Add 'show bl' to the usage output 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-06-18 15:16:07 -07:00
Tom Eastep
6ad9b95351 Implement 'show bl' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-06-18 13:27:25 -07:00
Tom Eastep
ac4bf15606 Implement 'status -i' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-06-18 11:07:37 -07:00
Tom Eastep
4e5d24fd9b Currect masq manpages 
Describe the SOURCE column as optional

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-06-16 07:27:05 -07:00
Tom Eastep
2610dd4744 Merge branch 'master' into 4.6.1 2014-06-12 16:39:01 -07:00
Roberto C. Sanchez
b3acb4d30d Fix typo 2014-06-12 18:58:59 -04:00
Tom Eastep
36e31ed839 Correct typo in error message 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-06-08 09:40:50 -07:00
Tom Eastep
b55b6a913c Insert the server address list into the error message in DNAT/REDIRECT 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-06-08 09:36:18 -07:00
Tom Eastep
9c9ae04c86 Raise an error when a server list is specified in a DNAT or REDIRECT rule 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2014-06-08 08:52:41 -07:00