Merge branch '4.5.15'

Conflicts:
	Shorewall/Perl/Shorewall/Proc.pm
This commit is contained in:
Tom Eastep 2013-03-30 18:08:17 -07:00
commit 1db5741edd

View File

@ -327,10 +327,14 @@ sub setup_interface_proc( $ ) {
push @emitted, "echo $value > /proc/sys/net/ipv4/conf/$physical/accept_source_route";
}
if ( interface_has_option( $interface, 'forward' , $value ) ) {
push @emitted, "echo $value > /proc/sys/net/ipv6/conf/$physical/forwarding";
}
if ( interface_has_option( $interface, 'accept_ra' , $value ) ) {
push @emitted, "echo $value > /proc/sys/net/ipv6/conf/$physical/accept_ra";
}
if ( @emitted ) {
emit( 'if [ $COMMAND = enable ]; then' );
push_indent;