Skip to content

Commit 2367c7d

Browse files
committed
bird2: Remove stray whitespace when no MD5
When no MD5 password is set, there should not be extra whitespace.
1 parent 699c4fd commit 2367c7d

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

data/ci/known-good/ci-apiv4-b2-rc1-lan1-ipv4.conf

-3
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,6 @@ protocol bgp pb_as42_vli3_ipv4 {
443443
import where f_import_as42();
444444
export none;
445445
};
446-
447446
password "mcWsqMdzGwTKt67g";
448447
}
449448

@@ -583,7 +582,6 @@ protocol bgp pb_as112_vli4_ipv4 {
583582
import where f_import_as112();
584583
export none;
585584
};
586-
587585
password "w83fmGpRDtaKomQo";
588586
}
589587

@@ -729,7 +727,6 @@ protocol bgp pb_as1213_vli1_ipv4 {
729727
import where f_import_as1213();
730728
export none;
731729
};
732-
733730
password "N7rX2SdfbRsyBLTm";
734731
}
735732

data/ci/known-good/ci-apiv4-b2-rc1-lan1-ipv6.conf

-2
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,6 @@ protocol bgp pb_as1213_vli1_ipv6 {
347347
import where f_import_as1213();
348348
export none;
349349
};
350-
351350
password "N7rX2SdfbRsyBLTm";
352351
}
353352

@@ -488,7 +487,6 @@ protocol bgp pb_as25441_vli6_ipv6 {
488487
import where f_import_as25441();
489488
export none;
490489
};
491-
492490
password "X8Ks9QnbER9cyzU3";
493491
}
494492

resources/views/api/v4/router/collector/bird2/neighbors.foil.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,9 @@ function f_import_as<?= $int['autsys'] ?>()
239239
import where f_import_as<?= $int['autsys'] ?>();
240240
export none;
241241
};
242-
243-
<?php if( $int['bgpmd5secret'] && !$t->router->skip_md5 ): ?>password "<?= $int['bgpmd5secret'] ?>";<?php endif; ?>
244-
242+
<?php if( $int['bgpmd5secret'] && !$t->router->skip_md5 ): ?>
243+
password "<?= $int['bgpmd5secret'] ?>";
244+
<?php endif; ?>
245245
}
246246

247247
<?php endforeach; ?>

resources/views/api/v4/router/server/bird2/neighbors.foil.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,9 @@
281281
table t_<?= $int['fvliid'] ?>_as<?= $int['autsys'] ?>;
282282
export filter f_export_as<?= $int['autsys'] ?>;
283283
};
284-
<?php if( $int['bgpmd5secret'] && !$t->router->skip_md5 ): ?>password "<?= $int['bgpmd5secret'] ?>";<?php endif; ?>
285-
284+
<?php if( $int['bgpmd5secret'] && !$t->router->skip_md5 ): ?>
285+
password "<?= $int['bgpmd5secret'] ?>";
286+
<?php endif; ?>
286287
}
287288

288289
<?php endforeach; ?>

0 commit comments

Comments
 (0)