aboutsummaryrefslogtreecommitdiffstats
path: root/config/haproxy
diff options
context:
space:
mode:
authorAndrew Thompson <andrewt@catalyst.net.nz>2012-02-22 12:18:51 +1300
committerAndrew Thompson <andrewt@catalyst.net.nz>2012-02-22 12:18:51 +1300
commit70e9cf3efa1c49359db9a8fb4c2935112d5045b3 (patch)
treef5e4946a8286b6c660c12bfd32a629c67f46150d /config/haproxy
parent8c8456dd49239cde8797c5f2b23e501784b37975 (diff)
downloadpfsense-packages-70e9cf3efa1c49359db9a8fb4c2935112d5045b3.tar.gz
pfsense-packages-70e9cf3efa1c49359db9a8fb4c2935112d5045b3.tar.bz2
pfsense-packages-70e9cf3efa1c49359db9a8fb4c2935112d5045b3.zip
find_carp_interface() has a bug where it returns the newline, trim it
here so we can compare strings.
Diffstat (limited to 'config/haproxy')
-rwxr-xr-xconfig/haproxy/haproxy_global.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/haproxy/haproxy_global.php b/config/haproxy/haproxy_global.php
index 1ef28005..340c578b 100755
--- a/config/haproxy/haproxy_global.php
+++ b/config/haproxy/haproxy_global.php
@@ -289,7 +289,7 @@ function enable_change(enable_change) {
foreach($config['virtualip']['vip'] as $carp):
if ($carp['mode'] != "carp") continue;
$ipaddress = $carp['subnet'];
- $carp_int = find_carp_interface($ipaddress);
+ $carp_int = trim(find_carp_interface($ipaddress));
?>
<option value="<?=$carp_int;?>"
<?php if (isset($pconfig['carpdev']) && $carp_int == $pconfig['carpdev']) echo "selected"; ?>>