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 |
|