From b80ebd2d768d5c3f8139af0eb7fce6b55d7ad059 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=E7i?= <eri@pfsense.org>
Date: Thu, 4 Mar 2010 22:36:23 +0000
Subject: Use the propper function to find the real interface in 2.0+.

---
 config/openospfd/openospfd.inc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/config/openospfd/openospfd.inc b/config/openospfd/openospfd.inc
index d38ec82f..5b600506 100644
--- a/config/openospfd/openospfd.inc
+++ b/config/openospfd/openospfd.inc
@@ -84,7 +84,14 @@ function ospfd_install_conf() {
 
 		if ($config['installedpackages']['ospfdinterfaces']['config']) {
                 	foreach ($config['installedpackages']['ospfdinterfaces']['config'] as $conf) {
-				$conffile .= "\tinterface " . $config['interfaces'][$conf['interface']]['if'];
+				if (intval($g['latest_config']) >= 6) {
+					$ospfdif = get_real_interface($conf['interface']);
+					if ($ospfdif)
+						$conffile .= "\tinterface {$ospfdif}";
+					else
+						continue;
+				} else
+					$conffile .= "\tinterface " . $config['interfaces'][$conf['interface']]['if'];
 				$options_present = false;
 				$ifconfigs = "";
 				if (!empty($conf['metric'])) {
-- 
cgit v1.2.3