summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2013-01-09 14:59:06 -0200
committerRenato Botelho <garga@FreeBSD.org>2013-01-09 14:59:06 -0200
commita6f1f6d1ecf48cea4c7865a56682c58c40bf4cde (patch)
tree44d0519603810023e74726dce7623046cb8273c5
parent5019ff8f89f16e401d29f48029c1e963d6b0a4ac (diff)
downloadpfsense-a6f1f6d1ecf48cea4c7865a56682c58c40bf4cde.zip
pfsense-a6f1f6d1ecf48cea4c7865a56682c58c40bf4cde.tar.gz
Fix convert_real_interface_to_friendly_interface_name() when parameter is already a friendly name and interface is using PPPoE. It should fix #2641
-rw-r--r--etc/inc/interfaces.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 2826761..ff04fa0 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -3485,7 +3485,7 @@ function convert_real_interface_to_friendly_interface_name($interface = "wan") {
//$ifdescrs = get_configured_interface_list(false, true);
foreach ($ifdescrs as $if => $ifname) {
- if ($config['interfaces'][$if]['if'] == $interface)
+ if ($if == $interface || $config['interfaces'][$if]['if'] == $interface)
return $if;
if (stristr($interface, "_wlan0") && $config['interfaces'][$if]['if'] == interface_get_wireless_base($interface))
OpenPOWER on IntegriCloud