summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorgnhb <gnoahb@gmail.com>2010-04-01 12:06:06 +0700
committergnhb <gnoahb@gmail.com>2010-04-01 12:06:06 +0700
commit0a59624c95095e5fe4eea3e1b2594189b2952750 (patch)
tree3a998b2166e9aa90b7c1cb7c6c9035d6804b2a0b /usr
parentb1bde547a96c30e21a5f2981354f0e70b5144514 (diff)
parent33c017b25a45ec5e763c5f9c6962307f9096174d (diff)
downloadpfsense-0a59624c95095e5fe4eea3e1b2594189b2952750.zip
pfsense-0a59624c95095e5fe4eea3e1b2594189b2952750.tar.gz
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/diag_logs.php2
-rw-r--r--usr/local/www/diag_logs_filter_summary.php2
-rwxr-xr-xusr/local/www/diag_logs_slbd.php98
-rw-r--r--usr/local/www/help.php1
-rwxr-xr-xusr/local/www/interfaces.php6
-rwxr-xr-xusr/sbin/update_dns_cache.sh30
6 files changed, 4 insertions, 135 deletions
diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php
index 360142a..58470f9 100755
--- a/usr/local/www/diag_logs.php
+++ b/usr/local/www/diag_logs.php
@@ -80,7 +80,7 @@ include("head.inc");
$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
$tab_array[] = array("IPsec", false, "diag_logs_ipsec.php");
$tab_array[] = array("VPN", false, "diag_logs_vpn.php");
- $tab_array[] = array("Load Balancer", false, "diag_logs_slbd.php");
+ $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php");
$tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php");
$tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php");
$tab_array[] = array("Settings", false, "diag_logs_settings.php");
diff --git a/usr/local/www/diag_logs_filter_summary.php b/usr/local/www/diag_logs_filter_summary.php
index 58be33e..485e26b 100644
--- a/usr/local/www/diag_logs_filter_summary.php
+++ b/usr/local/www/diag_logs_filter_summary.php
@@ -187,7 +187,7 @@ include("head.inc"); ?>
$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
$tab_array[] = array("IPsec", false, "diag_logs_ipsec.php");
$tab_array[] = array("VPN", false, "diag_logs_vpn.php");
- $tab_array[] = array("Load Balancer", false, "diag_logs_slbd.php");
+ $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php");
$tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php");
$tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php");
$tab_array[] = array("Settings", false, "diag_logs_settings.php");
diff --git a/usr/local/www/diag_logs_slbd.php b/usr/local/www/diag_logs_slbd.php
deleted file mode 100755
index 64ed3b2..0000000
--- a/usr/local/www/diag_logs_slbd.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/* $Id$ */
-/*
- diag_logs_slbd.php
- part of pfSense
-
- Copyright (C) 2005 Bill Marquette <bill.marquette@gmail.com>.
- Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
- pfSense_MODULE: routing
-*/
-
-##|+PRIV
-##|*IDENT=page-status-systemlogs-loadbalancer
-##|*NAME=Status: System logs: Load Balancer page
-##|*DESCR=Allow access to the 'Status: System logs: Load Balancer' page.
-##|*MATCH=diag_logs_slbd.php*
-##|-PRIV
-
-require("guiconfig.inc");
-
-$slbd_logfile = "{$g['varlog_path']}/slbd.log";
-
-$nentries = $config['syslog']['nentries'];
-if (!$nentries)
- $nentries = 50;
-
-if ($_POST['clear'])
- clear_log_file($slbd_logfile);
-
-$pgtitle = array("Status","System logs","Load Balancer");
-include("head.inc");
-
-?>
-
-<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<?php include("fbegin.inc"); ?>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr><td>
-<?php
- $tab_array = array();
- $tab_array[] = array("System", false, "diag_logs.php");
- $tab_array[] = array("Firewall", false, "diag_logs_filter.php");
- $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php");
- $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
- $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php");
- $tab_array[] = array("VPN", false, "diag_logs_vpn.php");
- $tab_array[] = array("Load Balancer", true, "diag_logs_slbd.php");
- $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php");
- $tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php");
- $tab_array[] = array("Settings", false, "diag_logs_settings.php");
- display_top_tabs($tab_array);
-?>
- </td></tr>
- <tr>
- <td>
- <div id="mainarea">
- <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td colspan="2" class="listtopic">
- Last <?=$nentries;?> Load Balancer log entries</td>
- </tr>
- <?php dump_clog($slbd_logfile, $nentries); ?>
- <tr><td><br><form action="diag_logs_slbd.php" method="post">
- <input name="clear" type="submit" class="formbtn" value="Clear log"></td></tr>
- </table>
- </div>
-</form>
- </td>
- </tr>
-</table>
-<?php include("fend.inc"); ?>
-</body>
-</html>
diff --git a/usr/local/www/help.php b/usr/local/www/help.php
index 2a07a5b..8a7514d 100644
--- a/usr/local/www/help.php
+++ b/usr/local/www/help.php
@@ -60,7 +60,6 @@ $helppages = array(
'diag_logs_ntpd.php' => 'http://doc.pfsense.org/index.php/NTP_Logs',
'diag_logs_relayd.php' => 'http://doc.pfsense.org/index.php/Load_Balancer_Logs',
'diag_logs_settings.php' => 'http://doc.pfsense.org/index.php/Log_Settings',
- 'diag_logs_slbd.php' => 'http://doc.pfsense.org/index.php/Load_Balancer_Logs',
'diag_logs_vpn.php' => 'http://doc.pfsense.org/index.php/PPTP_VPN_Logs',
'diag_logs_ipsec.php' => 'http://doc.pfsense.org/index.php/IPsec_Logs',
'diag_logs_openvpn.php' => 'http://doc.pfsense.org/index.php/OpenVPN_Logs',
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 9cf592e..cb6466f 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -490,10 +490,8 @@ if ($_POST) {
/* for dynamic interfaces we tack a gateway item onto the array to prevent system
* log messages from appearing. They can also manually add these items */
/* 1st added gateway gets a default bit */
- $gateway_item = array();
- if(empty($a_gateways)) {
- $gateway_item['defaultgw'] = "true";
- } else {
+ if(!empty($a_gateways)) {
+ $gateway_item = array();
/* check for duplicates */
$skip = false;
foreach($a_gateways as $item) {
diff --git a/usr/sbin/update_dns_cache.sh b/usr/sbin/update_dns_cache.sh
deleted file mode 100755
index cf58ffb..0000000
--- a/usr/sbin/update_dns_cache.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-mkdir -p /var/db/dnscache
-cd /var/db/dnscache
-
-while [ /bin/true ]; do
- cd /var/db/dnscache
- needsfilterreload=0
- for FILE in *; do
- DNSENTRIES=`host -t A $FILE | awk '/address/ {print $4}' | sort`
- echo "$DNSENTRIES" > /tmp/Njkd98u79.tmp
- CURRENTNR=`cat /tmp/Njkd98u79.tmp | wc -l | awk '{print $1}'`
- OLDNR=`cat $FILE | wc -l | awk '{print $1}'`
- if [ "$CURRENTNR" != "$OLDNR" ]; then
- needsfilterreload=1
- # if the number of hosts is different we reload and skip the rest
- continue
- fi
- # We need to compare the files.
- # We need to compare the files.
- cmp -s /tmp/Njkd98u79.tmp $FILE
- if [ "$?" -gt 0 ]; then
- needsfilterreload=1
- fi
- done
- if [ "$needsfilterreload" -gt 0 ]; then
- /etc/rc.filter_configure_sync
- fi
- sleep 480
-done
OpenPOWER on IntegriCloud