holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity
11,306 Commits 104 Branches 736 Tags 54 MiB
3bdf703522
Commit Graph

4787 Commits

Author SHA1 Message Date
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