move conditional checks for ttl-security back into the node.def files to keep them from being checked on every commit

1 files changed, 0 insertions, 13 deletions

diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl
index daf5b360..c6188d36 100755
--- a/scripts/bgp/vyatta-bgp.pl
+++ b/scripts/bgp/vyatta-bgp.pl
@@ -1216,17 +1216,6 @@ sub check_for_peer_groups {
     }
 }
 
-
-# check that both ttl-security and ebgpmultihops aren't both defined
-sub check_ttl_conflict {
-    my ($config, $path) = @_;
-
-    my $ebgphops = $config->returnValue("$path ebgp-multihop");
-    my $ttlsecurity = $config->returnValue("$path ttl-security hops");
-	die "protocols bgp $path: can not define both ebgp-mulithop and ttl-security hops\n"
-	    if (defined($ebgphops) && defined($ttlsecurity));
-}
-
 # check that changed neighbors have a remote-as or peer-group defined
 sub check_remote_as {
     my $config = new Vyatta::Config;
@@ -1239,8 +1228,6 @@ sub check_remote_as {
       foreach my $neighbor (@neighbors) {
 	  next unless $config->isChanged("$as neighbor $neighbor");
 
-	  check_ttl_conflict($config, "$as neighbor $neighbor");
-
           my $remoteas = $config->returnValue("$as neighbor $neighbor remote-as");
           my ($peergroup, $peergroupas);
           if ($config->exists("$as neighbor $neighbor peer-group")) {