diff options
| -rw-r--r-- | etc/inc/interfaces.inc | 2 | ||||
| -rw-r--r-- | usr/local/pkg/carp.xml | 4 | ||||
| -rw-r--r-- | usr/local/pkg/carp_settings.xml | 2 | ||||
| -rwxr-xr-x | usr/local/www/carp_status.php | 2 | ||||
| -rwxr-xr-x | usr/local/www/exec.php | 4 | ||||
| -rwxr-xr-x | usr/local/www/xmlrpc.php | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 7cd44da..40d0947 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -1161,7 +1161,7 @@ function interface_carp_configure(&$vip) { global $config, $g; if(isset($config['system']['developerspew'])) { $mt = microtime(); - echo "interfaces_carp_configure() being called $mt\n"; + echo "interface_carp_configure() being called $mt\n"; } if ($vip['mode'] != "carp") diff --git a/usr/local/pkg/carp.xml b/usr/local/pkg/carp.xml index 0f536a4..e4db39c 100644 --- a/usr/local/pkg/carp.xml +++ b/usr/local/pkg/carp.xml @@ -218,12 +218,12 @@ <custom_php_command_before_form> </custom_php_command_before_form> <custom_add_php_command_late> - interfaces_carp_configure(); + interfaces_carp_setup(); </custom_add_php_command_late> <custom_php_resync_config_command> </custom_php_resync_config_command> <custom_delete_php_command> - interfaces_carp_configure(); + interfaces_carp_setup(); </custom_delete_php_command> <custom_php_deinstall_command> unlink_if_exists("/usr/local/pkg/carp*"); diff --git a/usr/local/pkg/carp_settings.xml b/usr/local/pkg/carp_settings.xml index 8b37e8c..43c8804 100644 --- a/usr/local/pkg/carp_settings.xml +++ b/usr/local/pkg/carp_settings.xml @@ -183,7 +183,7 @@ </custom_php_validation_command> <custom_add_php_command_late> /* setup carp interfaces */ - interfaces_carp_configure(); + interfaces_carp_setup(); /* force a filter configure for syncing */ filter_configure(); </custom_add_php_command_late> diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php index efb147f..87f9419 100755 --- a/usr/local/www/carp_status.php +++ b/usr/local/www/carp_status.php @@ -64,7 +64,7 @@ if($_POST['disablecarp'] <> "") { } else { $savemsg = "CARP has been enabled."; mwexec("/sbin/sysctl net.inet.carp.allow=1"); - interfaces_carp_configure(); + interfaces_carp_setup(); } } diff --git a/usr/local/www/exec.php b/usr/local/www/exec.php index 8f3ee4f..b680145 100755 --- a/usr/local/www/exec.php +++ b/usr/local/www/exec.php @@ -307,7 +307,7 @@ if (!isBlank($_POST['txtPHPCommand'])) { <td valign="top" class="label"> <input type="submit" class="button" value="Execute"> <p> - <strong>Example:</strong> interfaces_carp_configure(); + <strong>Example:</strong> interfaces_carp_setup(); </td> </tr> @@ -326,4 +326,4 @@ document.forms[0].txtCommand.focus(); if($_POST) conf_mount_ro(); -?>
\ No newline at end of file +?> diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php index d3679d7..0f2e445 100755 --- a/usr/local/www/xmlrpc.php +++ b/usr/local/www/xmlrpc.php @@ -297,7 +297,7 @@ function interfaces_carp_configure_xmlrpc($raw_params) { global $xmlrpc_g; $params = xmlrpc_params_to_php($raw_params); if(!xmlrpc_auth($params)) return $xmlrpc_g['return']['authfail']; - interfaces_carp_configure(); + interfaces_carp_setup(); return $xmlrpc_g['return']['true']; } |
