Merge branch '4.5.14'

This commit is contained in:
Tom Eastep 2013-03-21 12:00:20 -07:00
commit 9e5cf92a59
2 changed files with 1 additions and 7 deletions

View File

@ -690,7 +690,7 @@ sub validate_6net( $$ ) {
assert( ! $allow_name ); assert( ! $allow_name );
( $net , $vlsm ); ( $net , $vlsm );
} elsif ( valid_6address ( $net ) ) { } elsif ( valid_6address ( $net ) ) {
$vlsm == 32 ? $net : "$net/$vlsm"; $vlsm == 128 ? $net : "$net/$vlsm";
} else { } else {
$net; $net;
} }

View File

@ -739,12 +739,6 @@ if [ -f findgw ]; then
fi fi
fi fi
#
# Delete the tcstart file
#
delete_file ${DESTDIR}${SHAREDIR}/$PRODUCT/tcstart
# #
# Delete the Limits Files # Delete the Limits Files
# #