From 0e79d356d17584e69ffc9be6561d8858b483a952 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Mon, 7 Jul 2008 00:59:30 +0000
Subject: Eliminate interfaces_carp_bring_up_final()

---
 usr/local/www/carp_status.php         | 1 -
 usr/local/www/exec.php                | 2 +-
 usr/local/www/firewall_virtual_ip.php | 1 -
 usr/local/www/xmlrpc.php              | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'usr/local')

diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php
index 30a50ad..93c5b39 100755
--- a/usr/local/www/carp_status.php
+++ b/usr/local/www/carp_status.php
@@ -53,7 +53,6 @@ if($_POST['disablecarp'] <> "") {
 		$savemsg = "CARP has been enabled.";
 		mwexec("/sbin/sysctl net.inet.carp.allow=1");
 		interfaces_carp_configure();
-		interfaces_carp_bring_up_final();
 	}
 }
 
diff --git a/usr/local/www/exec.php b/usr/local/www/exec.php
index 3d1aa5a..de237a7 100755
--- a/usr/local/www/exec.php
+++ b/usr/local/www/exec.php
@@ -277,7 +277,7 @@ if (!isBlank($_POST['txtPHPCommand'])) {
       <td valign="top" class="label">
          <input type="submit" class="button" value="Execute">
 	 <p>
-	 <strong>Example:</strong>   interfaces_carp_bring_up_final();
+	 <strong>Example:</strong>   interfaces_carp_configure();
       </td>
     </tr>
     
diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php
index d6b03b9..d600e6a 100755
--- a/usr/local/www/firewall_virtual_ip.php
+++ b/usr/local/www/firewall_virtual_ip.php
@@ -61,7 +61,6 @@ if ($_POST) {
 		/* reset carp states */
 		reset_carp();
 		interfaces_carp_configure();
-		interfaces_carp_bring_up_final();
 		
 		$savemsg = get_std_save_message($retval);
 		unlink_if_exists($d_vipconfdirty_path);
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php
index d4cc397..78a1baa 100755
--- a/usr/local/www/xmlrpc.php
+++ b/usr/local/www/xmlrpc.php
@@ -288,7 +288,6 @@ function interfaces_carp_configure_xmlrpc($raw_params) {
 	$params = xmlrpc_params_to_php($raw_params);
 	if(!xmlrpc_auth($params)) return $xmlrpc_g['return']['authfail'];
 	interfaces_carp_configure();
-	interfaces_carp_bring_up_final();
 	return $xmlrpc_g['return']['true'];
 }
 
-- 
cgit v1.1