Tom Eastep
|
50ceb877f8
|
Merge branch 'master' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall
Conflicts:
docs/Dynamic.xml
|
2012-10-12 10:09:26 -07:00 |
|
Tom Eastep
|
cc90a06958
|
Add RESTORE_ROUTEMARKS option
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-11 07:34:57 -07:00 |
|
Tom Eastep
|
2a175c627e
|
Merge branch '4.5.8'
|
2012-10-09 16:54:22 -07:00 |
|
Tom Eastep
|
4bb86d8126
|
Correct typo in shorewallrc.default
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-09 16:53:49 -07:00 |
|
Tom Eastep
|
18f981d7cc
|
Update formatting in Dynamic Zones doc.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-09 07:08:35 -07:00 |
|
Tom Eastep
|
f53618fc0c
|
Re-order logic in add_group_to_zone
- Need to normalize the address prior to comparing it with ALLIP
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-08 08:55:20 -07:00 |
|
Tom Eastep
|
54e066ec3a
|
Re-order logic in add_group_to_zone
- Need to normalize the address prior to comparing it with ALLIP
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-08 08:54:54 -07:00 |
|
Tom Eastep
|
edd9360b41
|
Make the -lite installers consistent with the others WRT SYSTEMD and INITFILE
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-08 07:53:18 -07:00 |
|
Tom Eastep
|
880e63064b
|
Make the -lite installers consistent with the others WRT SYSTEMD and INITFILE
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-08 07:35:47 -07:00 |
|
Tom Eastep
|
620f88b339
|
Merge branch '4.5.8'
|
2012-10-07 17:41:01 -07:00 |
|
Tom Eastep
|
b7e6b1aa41
|
Allow IP range in the hosts file
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-07 17:40:42 -07:00 |
|
Tom Eastep
|
c84603cdc6
|
Merge branch '4.5.8'
Conflicts:
Shorewall/Perl/Shorewall/Zones.pm
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-07 17:04:27 -07:00 |
|
Tom Eastep
|
e2b029b0ba
|
More hosts file corrections.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-07 17:00:35 -07:00 |
|
Tom Eastep
|
0efc0451c1
|
Allow IP range in the hosts file
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-07 15:59:30 -07:00 |
|
Tom Eastep
|
9dd66fc6ff
|
Allow IP range in the hosts file
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-07 15:55:00 -07:00 |
|
Tom Eastep
|
1195661264
|
Document new Dynamic Zone implementation
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-07 12:20:36 -07:00 |
|
Tom Eastep
|
c942bf01dc
|
Document new Dynamic Zone implementation
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-07 12:11:28 -07:00 |
|
Tom Eastep
|
0c9cc4a233
|
Change the 'dynamic' zone option to 'dynamic_shared'
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-07 09:18:18 -07:00 |
|
Tom Eastep
|
1df48b46ef
|
Enable 'show dynamic' for dynamic zones.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-07 08:36:28 -07:00 |
|
Tom Eastep
|
8c97681421
|
Merge branch '4.5.8'
Conflicts:
Shorewall-core/lib.cli
|
2012-10-07 08:24:04 -07:00 |
|
Tom Eastep
|
431309678a
|
Enable dynamic zones to work with all ipset versions
- Re-add lost logic from 4.5.8.1 fix.
- create separate variables for add/delete and LIST
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-07 08:10:57 -07:00 |
|
Tom Eastep
|
7ca1a43118
|
Fix 'show dynamic'
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-07 07:15:43 -07:00 |
|
Tom Eastep
|
8091ad6c70
|
Modify lib.cli to run the 'add' and 'delete' to allow the zone name to come first
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-06 09:22:14 -07:00 |
|
Tom Eastep
|
c228668500
|
Implement logic associated with 'dynamic' zone option
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-06 07:52:06 -07:00 |
|
Tom Eastep
|
afaba46aa3
|
Add 'dynamic' zone option.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-06 07:21:49 -07:00 |
|
Tom Eastep
|
25c445830b
|
Merge branch '4.5.8'
|
2012-10-05 14:49:24 -07:00 |
|
Tom Eastep
|
73b70a86d2
|
Correct syntax error in Shorewall-init installer
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-05 07:24:40 -07:00 |
|
Tom Eastep
|
1f38a36acf
|
Delete extraneous logic
Signed-off-by: Tom Eastep <teastep@shorewall.net>
Conflicts:
Shorewall/Perl/Shorewall/Zones.pm
|
2012-10-04 09:45:25 -07:00 |
|
Tom Eastep
|
526f72216a
|
Correct handling of dash characters in interface/ipset names.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-04 07:34:41 -07:00 |
|
Tom Eastep
|
642ff1be15
|
Correct handling of dash characters in interface/ipset names.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-02 10:09:23 -07:00 |
|
Tom Eastep
|
c12985b75b
|
Correct typo in error message.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-01 07:17:39 -07:00 |
|
Tom Eastep
|
22c3766b47
|
Correct typo in error message.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-01 07:17:03 -07:00 |
|
Tom Eastep
|
92d39dc56d
|
Expunge the g_perllib variable
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-01 06:59:39 -07:00 |
|
Tom Eastep
|
a8e9296473
|
Expunge the g_sbindir variable
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-01 06:55:48 -07:00 |
|
Tom Eastep
|
749e239d15
|
Expunge the g_libexec variable
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-01 06:51:36 -07:00 |
|
Tom Eastep
|
526ad75c49
|
Expunge the g_vardir variable
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-10-01 06:44:52 -07:00 |
|
Tom Eastep
|
30d4ba67cc
|
Revert "Allow '-' in the interface for dynamic zone."
This reverts commit b68b34b820 .
|
2012-09-30 16:25:35 -07:00 |
|
Tom Eastep
|
4ef81041be
|
Delete extraneous logic
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-09-30 16:09:34 -07:00 |
|
Tom Eastep
|
8d35c1b9d8
|
Merge branch '4.5.8'
Conflicts:
Shorewall-core/lib.cli
|
2012-09-30 16:09:12 -07:00 |
|
Tom Eastep
|
b68b34b820
|
Allow '-' in the interface for dynamic zone.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-09-30 16:04:38 -07:00 |
|
Tom Eastep
|
a12f1f9fbb
|
Always set IPSET in get_config()
- Previously, lib.cli-std set the variable but lib.cli did not.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-09-30 11:36:40 -07:00 |
|
Tom Eastep
|
d1bf727127
|
Allow dynamic zones to work with ipset V5
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-09-30 08:52:56 -07:00 |
|
Tom Eastep
|
4311dc5ddf
|
Merge branch '4.5.8'
|
2012-09-29 09:03:12 -07:00 |
|
Tom Eastep
|
38faa3e071
|
Correct handling of new ipv6 net syntax in the hosts file.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-09-29 09:01:17 -07:00 |
|
Tom Eastep
|
81f92546d8
|
Merge branch '4.5.8'
|
2012-09-29 08:08:00 -07:00 |
|
Tom Eastep
|
91e2c31a58
|
Correct handling of new ipv6 net syntax in the hosts file.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-09-27 14:51:28 -07:00 |
|
Tom Eastep
|
e2eba9468d
|
Update IPv6 doc with new syntax.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-09-27 14:30:26 -07:00 |
|
Tom Eastep
|
9c893a0e21
|
Restore the original calling sequences of validate_[46]net()
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-09-27 07:22:40 -07:00 |
|
Tom Eastep
|
c8c1585dfc
|
Merge branch '4.5.8'
|
2012-09-26 15:48:44 -07:00 |
|
Tom Eastep
|
ffcf262de4
|
Ensure that the 1:1 NAT chain jumps always come last in PREROUTING.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
|
2012-09-26 15:46:52 -07:00 |
|