Skip to content

Commit

Permalink
bird2: Remove stray whitespace when no MD5
Browse files Browse the repository at this point in the history
When no MD5 password is set, there should not be extra whitespace.
  • Loading branch information
rlaager committed May 28, 2023
1 parent 699c4fd commit 2367c7d
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 10 deletions.
3 changes: 0 additions & 3 deletions data/ci/known-good/ci-apiv4-b2-rc1-lan1-ipv4.conf
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,6 @@ protocol bgp pb_as42_vli3_ipv4 {
import where f_import_as42();
export none;
};

password "mcWsqMdzGwTKt67g";
}

Expand Down Expand Up @@ -583,7 +582,6 @@ protocol bgp pb_as112_vli4_ipv4 {
import where f_import_as112();
export none;
};

password "w83fmGpRDtaKomQo";
}

Expand Down Expand Up @@ -729,7 +727,6 @@ protocol bgp pb_as1213_vli1_ipv4 {
import where f_import_as1213();
export none;
};

password "N7rX2SdfbRsyBLTm";
}

Expand Down
2 changes: 0 additions & 2 deletions data/ci/known-good/ci-apiv4-b2-rc1-lan1-ipv6.conf
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,6 @@ protocol bgp pb_as1213_vli1_ipv6 {
import where f_import_as1213();
export none;
};

password "N7rX2SdfbRsyBLTm";
}

Expand Down Expand Up @@ -488,7 +487,6 @@ protocol bgp pb_as25441_vli6_ipv6 {
import where f_import_as25441();
export none;
};

password "X8Ks9QnbER9cyzU3";
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,9 @@ function f_import_as<?= $int['autsys'] ?>()
import where f_import_as<?= $int['autsys'] ?>();
export none;
};

<?php if( $int['bgpmd5secret'] && !$t->router->skip_md5 ): ?>password "<?= $int['bgpmd5secret'] ?>";<?php endif; ?>

<?php if( $int['bgpmd5secret'] && !$t->router->skip_md5 ): ?>
password "<?= $int['bgpmd5secret'] ?>";
<?php endif; ?>
}

<?php endforeach; ?>
5 changes: 3 additions & 2 deletions resources/views/api/v4/router/server/bird2/neighbors.foil.php
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,9 @@
table t_<?= $int['fvliid'] ?>_as<?= $int['autsys'] ?>;
export filter f_export_as<?= $int['autsys'] ?>;
};
<?php if( $int['bgpmd5secret'] && !$t->router->skip_md5 ): ?>password "<?= $int['bgpmd5secret'] ?>";<?php endif; ?>

<?php if( $int['bgpmd5secret'] && !$t->router->skip_md5 ): ?>
password "<?= $int['bgpmd5secret'] ?>";
<?php endif; ?>
}

<?php endforeach; ?>
Expand Down

0 comments on commit 2367c7d

Please sign in to comment.