From 70e9cf3efa1c49359db9a8fb4c2935112d5045b3 Mon Sep 17 00:00:00 2001
From: Andrew Thompson <andrewt@catalyst.net.nz>
Date: Wed, 22 Feb 2012 12:18:51 +1300
Subject: find_carp_interface() has a bug where it returns the newline, trim it
 here so we can compare strings.

---
 config/haproxy/haproxy_global.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config/haproxy/haproxy_global.php')

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"; ?>>
-- 
cgit v1.2.3