diff options
| author | Phil Davis <phil.davis@inf.org> | 2015-03-13 14:30:51 +0545 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2015-03-13 14:30:51 +0545 |
| commit | a08d505596b79a1ac0465d0ac898ca070c7d613f (patch) | |
| tree | 13280eda5ec1fdc7f70ac04ac2cac6181a73b17c /etc | |
| parent | f2f34088ace895b0113b468b856ceb02301585d1 (diff) | |
| download | pfsense-a08d505596b79a1ac0465d0ac898ca070c7d613f.zip pfsense-a08d505596b79a1ac0465d0ac898ca070c7d613f.tar.gz | |
Update get_possible_traffic_source_addresses returned array format
With this change it looks to me like the way it is intended to be, based
on what was done to get_possible_listen_ips()
Please review and check if this is what was intended for the code. With
this change it should make the returned $sourceips array be in a
consistent format the same way as get_possible_listen_ips()
This is a fix for code that was only committed in master. So at this
time the fix is only needed in master.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/interfaces.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index a980d47..9d02b91 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -5266,10 +5266,8 @@ function get_possible_traffic_source_addresses($include_ipv6_link_local=false) { if (is_array($config['openvpn']["openvpn-{$mode}"])) { foreach ($config['openvpn']["openvpn-{$mode}"] as $id => $setting) { if (!isset($setting['disable'])) { - $vpn = array(); - $vpn['value'] = 'ovpn' . substr($mode, 0, 1) . $setting['vpnid']; - $vpn['name'] = gettext("OpenVPN") . " ".$mode.": ".htmlspecialchars($setting['description']); - $sourceips[] = $vpn; + $sourceips_key = 'ovpn' . substr($mode, 0, 1) . $setting['vpnid']; + $sourceips[$sourceips_key] = gettext("OpenVPN") . " ".$mode.": ".htmlspecialchars($setting['description']); } } } |
