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
|
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
|
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
|
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
|
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
|
24e115d0f9
|
Move a comment
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-04-06 08:00:20 -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
|
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
|
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
|
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
|
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
|
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
|
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 |
|