/[smeserver]/rpms/e-smith-base/sme9/e-smith-base-5.6.0-allow_32bits_mask.patch
ViewVC logotype

Contents of /rpms/e-smith-base/sme9/e-smith-base-5.6.0-allow_32bits_mask.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (show annotations) (download)
Tue Sep 13 07:32:36 2016 UTC (7 years, 8 months ago) by vip-ire
Branch: MAIN
CVS Tags: e-smith-base-5_6_0-34_el6_sme, e-smith-base-5_6_0-36_el6_sme, e-smith-base-5_6_0-30_el6_sme, e-smith-base-5_6_0-35_el6_sme, e-smith-base-5_6_0-29_el6_sme, e-smith-base-5_6_0-33_el6_sme, e-smith-base-5_6_0-32_el6_sme, e-smith-base-5_6_0-31_el6_sme, HEAD 
* Tue Sep 13 2016 Daniel Berteaud <daniel@firewall-services.com> 5.6.0-29.sme
- Allow /32 masks on the external interface, in which case we don't
  check if the gateway is on the correct network) [SME: 9765]
1 diff -Nur e-smith-base-5.6.0/root/etc/e-smith/templates/etc/sysconfig/network/40GATEWAYDEV e-smith-base-5.6.0_bs9765/root/etc/e-smith/templates/etc/sysconfig/network/40GATEWAYDEV
2 --- e-smith-base-5.6.0/root/etc/e-smith/templates/etc/sysconfig/network/40GATEWAYDEV 2008-03-26 17:48:59.000000000 +0100
3 +++ e-smith-base-5.6.0_bs9765/root/etc/e-smith/templates/etc/sysconfig/network/40GATEWAYDEV 1970-01-01 01:00:00.000000000 +0100
4 @@ -1,8 +0,0 @@
5 -{
6 - return "" unless (defined $ExternalInterface && defined $GatewayIP);
7 -
8 - my $dev = ($ExternalInterface{Configuration} eq 'disabled') ?
9 - $InternalInterface{Name} :
10 - $ExternalInterface{Name};
11 - return "GATEWAYDEV=$dev";
12 -}
13 diff -Nur e-smith-base-5.6.0/root/etc/e-smith/templates/etc/sysconfig/network/50GATEWAY e-smith-base-5.6.0_bs9765/root/etc/e-smith/templates/etc/sysconfig/network/50GATEWAY
14 --- e-smith-base-5.6.0/root/etc/e-smith/templates/etc/sysconfig/network/50GATEWAY 2005-11-21 05:28:08.000000000 +0100
15 +++ e-smith-base-5.6.0_bs9765/root/etc/e-smith/templates/etc/sysconfig/network/50GATEWAY 1970-01-01 01:00:00.000000000 +0100
16 @@ -1,6 +0,0 @@
17 -{
18 - $OUT = "GATEWAY=";
19 -
20 - $OUT .= ($AccessType eq "dedicated" and defined $GatewayIP) ? $GatewayIP
21 - : "";
22 -}
23 diff -Nur e-smith-base-5.6.0/root/etc/e-smith/templates/etc/sysconfig/network-scripts/route-ethX/08Gateway e-smith-base-5.6.0_bs9765/root/etc/e-smith/templates/etc/sysconfig/network-scripts/route-ethX/08Gateway
24 --- e-smith-base-5.6.0/root/etc/e-smith/templates/etc/sysconfig/network-scripts/route-ethX/08Gateway 1970-01-01 01:00:00.000000000 +0100
25 +++ e-smith-base-5.6.0_bs9765/root/etc/e-smith/templates/etc/sysconfig/network-scripts/route-ethX/08Gateway 2016-09-06 21:40:52.325865196 +0200
26 @@ -0,0 +1,7 @@
27 +{
28 + return "" unless (defined $GatewayIP && (
29 + ($SystemMode eq 'serveronly' && $InternalInterface{Name} eq $THIS_DEVICE ) ||
30 + ($ExternalInterface{Name} eq $THIS_DEVICE) ));
31 + $OUT .= "$GatewayIP dev $THIS_DEVICE\n";
32 + $OUT .= "default via $GatewayIP dev $THIS_DEVICE\n";
33 +}
34 diff -Nur e-smith-base-5.6.0/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm e-smith-base-5.6.0_bs9765/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm
35 --- e-smith-base-5.6.0/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm 2016-09-06 21:38:23.215953854 +0200
36 +++ e-smith-base-5.6.0_bs9765/root/usr/share/perl5/vendor_perl/esmith/console/configure.pm 2016-09-06 21:46:06.424682868 +0200
37 @@ -1046,7 +1046,7 @@
38 $error = "address matches external interface address";
39 }
40 elsif (!ipv4_in_network($db->get_value('ExternalIP'),
41 - $db->get_value('ExternalNetmask'), "$choice/32"))
42 + $db->get_value('ExternalNetmask'), "$choice/32") && $db->get_value('ExternalNetmask') ne '255.255.255.255')
43 {
44 $error = "address is not local";
45 }
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed