aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2013-02-19 12:46:07 -0500
committerjim-p <jimp@pfsense.org>2013-02-19 12:46:07 -0500
commitd9da4e43b78cffee861415e9a1628dde12602c6f (patch)
treebf76cccc15068e46596da8bc9880de1e76d269a4
parent1cffd57c76630d8f116a1a805a52938548808337 (diff)
downloadpfsense-packages-d9da4e43b78cffee861415e9a1628dde12602c6f.tar.gz
pfsense-packages-d9da4e43b78cffee861415e9a1628dde12602c6f.tar.bz2
pfsense-packages-d9da4e43b78cffee861415e9a1628dde12602c6f.zip
Fix "no redistribute" networks in quagga. See http://forum.pfsense.org/index.php/topic,59022.0.html
-rw-r--r--config/quagga_ospfd/quagga_ospfd.inc2
-rw-r--r--config/quagga_ospfd/quagga_ospfd.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
4 files changed, 4 insertions, 4 deletions
diff --git a/config/quagga_ospfd/quagga_ospfd.inc b/config/quagga_ospfd/quagga_ospfd.inc
index 598d3c00..6dd917f3 100644
--- a/config/quagga_ospfd/quagga_ospfd.inc
+++ b/config/quagga_ospfd/quagga_ospfd.inc
@@ -215,11 +215,11 @@ function quagga_ospfd_install_conf() {
$conffile .= $redist;
if (!empty($noredist)) {
+ $conffile .= $noredist;
$conffile .= " distribute-list dnr-list out connected\n";
$conffile .= " distribute-list dnr-list out kernel\n";
$conffile .= " distribute-list dnr-list out static\n";
//$conffile .= " distribute-list dnr-list out ospf\n";
- $conffile .= $noredist;
$conffile .= " access-list dnr-list permit any\n";
}
diff --git a/config/quagga_ospfd/quagga_ospfd.xml b/config/quagga_ospfd/quagga_ospfd.xml
index d1e96efa..3a852a80 100644
--- a/config/quagga_ospfd/quagga_ospfd.xml
+++ b/config/quagga_ospfd/quagga_ospfd.xml
@@ -1,6 +1,6 @@
<packagegui>
<name>quagga_ospfd</name>
- <version>0.5</version>
+ <version>0.5.1</version>
<title>Services: Quagga OSPFd</title>
<include_file>/usr/local/pkg/quagga_ospfd.inc</include_file>
<aftersaveredirect>pkg_edit.php?xml=quagga_ospfd.xml&amp;id=0</aftersaveredirect>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 06f13826..a968e96b 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1679,7 +1679,7 @@
<name>Quagga OSPF</name>
<descr>OSPF routing protocol using Quagga -- WARNING! Installs files to the same place as OpenOSPFD and OpenBGPD. Installing both will break things.</descr>
<maintainer>jimp@pfsense.org</maintainer>
- <version>0.99.20.1 v0.5</version>
+ <version>0.99.20.1 v0.5.1</version>
<category>Routing</category>
<status>BETA</status>
<depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 512c5190..d40d44dc 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1666,7 +1666,7 @@
<name>Quagga OSPF</name>
<descr>OSPF routing protocol using Quagga -- WARNING! Installs files to the same place as OpenOSPFD and OpenBGPD. Installing both will break things.</descr>
<maintainer>jimp@pfsense.org</maintainer>
- <version>0.99.20.1 v0.5</version>
+ <version>0.99.20.1 v0.5.1</version>
<category>Routing</category>
<status>BETA</status>
<depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>