summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Fonnesbeck <efonnes@gmail.com>2010-08-02 16:30:09 -0600
committerErik Fonnesbeck <efonnes@gmail.com>2010-08-02 16:30:09 -0600
commit8e06972c7d161de50e0bfe085b664d6335a73c7f (patch)
treec3e87a46dfb988c320192267f552c4a44adf3f29
parent0ce726624dc1fbc4998ca85d79b27d810d88d5fb (diff)
downloadpfsense-8e06972c7d161de50e0bfe085b664d6335a73c7f.zip
pfsense-8e06972c7d161de50e0bfe085b664d6335a73c7f.tar.gz
Revert "Adjust case of aliases/description names for PPTP and PPPoE server interfaces." since it affects a package that is using the pptp alias.
This reverts commit 429cac0198aea4c42f815e639fb123157de1861b.
-rw-r--r--etc/inc/filter.inc4
-rw-r--r--etc/inc/interfaces.inc4
2 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 3065d85..c480381 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -707,7 +707,7 @@ function filter_generate_optcfg_array() {
if($config['pptpd']['mode'] == "server" || $config['pptpd']['mode'] == "redir") {
$oic = array();
$oic['if'] = 'pptp';
- $oic['descr'] = 'PPTP';
+ $oic['descr'] = 'pptp';
$oic['ip'] = $config['pptpd']['localip'];
$oic['sa'] = $config['pptpd']['remoteip'];
$oic['mode'] = $config['pptpd']['mode'];
@@ -735,7 +735,7 @@ function filter_generate_optcfg_array() {
if($config['pppoe']['mode'] == "server") {
$oic = array();
$oic['if'] = 'pppoe';
- $oic['descr'] = 'PPPoE';
+ $oic['descr'] = 'pppoe';
$oic['ip'] = $config['pppoe']['localip'];
$oic['sa'] = $config['pppoe']['remoteip'];
$oic['mode'] = $config['pppoe']['mode'];
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 942e8df..ebd0a71 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -2573,10 +2573,10 @@ function convert_friendly_interface_to_friendly_descr($interface) {
$ifdesc = "L2TP";
break;
case "pptp":
- $ifdesc = "PPTP";
+ $ifdesc = "pptp";
break;
case "pppoe":
- $ifdesc = "PPPoE";
+ $ifdesc = "pppoe";
break;
case "openvpn":
$ifdesc = "OpenVPN";
OpenPOWER on IntegriCloud