diff options
| author | Stephen Beaver <sbeaver@netgate.com> | 2016-02-14 12:51:41 -0500 |
|---|---|---|
| committer | Stephen Beaver <sbeaver@netgate.com> | 2016-02-14 12:51:41 -0500 |
| commit | dd426bc376c75d33cd4613c44bf05bd11e7cb581 (patch) | |
| tree | 4b41850fcb7776c432c0290680921dbc7e299997 | |
| parent | 6a5fc3d7108e30f5a6867fe730804fe3064931d8 (diff) | |
| parent | 9b277ab8a84cd0f5d668766edf59a64a0f258a70 (diff) | |
| download | pfsense-dd426bc376c75d33cd4613c44bf05bd11e7cb581.zip pfsense-dd426bc376c75d33cd4613c44bf05bd11e7cb581.tar.gz | |
Merge pull request #2635 from NewEraCracker/printf-fix
| -rw-r--r-- | src/etc/inc/interfaces.inc | 3 | ||||
| -rwxr-xr-x | src/usr/local/sbin/ppp-linkdown | 8 | ||||
| -rw-r--r-- | src/usr/local/www/status_ntpd.php | 4 | ||||
| -rwxr-xr-x | src/usr/local/www/status_pkglogs.php | 2 |
4 files changed, 12 insertions, 5 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index af0d11f..5d4d775 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -1766,6 +1766,8 @@ EOD; } } +/* Omit this, we maintain the default route by other means, and it causes problems with + * default gateway switching. See redmine #1837 if (($interface == "wan" && $founddefaultgw == false) || $setdefaultgw == true) { $setdefaultgw = true; $mpdconf .= <<<EOD @@ -1773,6 +1775,7 @@ EOD; EOD; } +*/ $mpdconf .= <<<EOD set iface {$ondemand} on-demand set iface idle {$ppp['idletimeout']} diff --git a/src/usr/local/sbin/ppp-linkdown b/src/usr/local/sbin/ppp-linkdown index 6fca066..3faf5f1 100755 --- a/src/usr/local/sbin/ppp-linkdown +++ b/src/usr/local/sbin/ppp-linkdown @@ -13,9 +13,13 @@ fi if [ "${PROTOCOL}" == "inet" && -s "/tmp/${IF}_defaultgw" ]; then GW=`head -n 1 /tmp/${IF}_defaultgw` - [ -n "${GW}" ] \ - && /sbin/route -q delete default ${GW} + DGW=`/sbin/route -n get -inet default | /usr/bin/awk '/gateway:/ {print $2}'` + # Only remove the default gateway if it matches the gateway for this interface. See redmine #1837 + if [ "${GW}" = "${DGW}" ]; then + /sbin/route -q delete default ${GW} + fi fi + if [ "${PROTOCOL}" == "inet6" ]; then /usr/local/sbin/ppp-ipv6 ${IF} down fi diff --git a/src/usr/local/www/status_ntpd.php b/src/usr/local/www/status_ntpd.php index 8b6b121..9a451ec 100644 --- a/src/usr/local/www/status_ntpd.php +++ b/src/usr/local/www/status_ntpd.php @@ -299,10 +299,10 @@ if (($gps_ok) && ($gps_lat) && ($gps_lon)): <tbody> <tr> <td> - <?=printf("%.5f", $gps_lat); ?> (<?=printf("%d", $gps_lat_deg); ?>° <?=printf("%.5f", $gps_lat_min*60); ?><?=$gps_vars[4]; ?>) + <?=sprintf("%.5f", $gps_lat); ?> (<?=sprintf("%d", $gps_lat_deg); ?>° <?=sprintf("%.5f", $gps_lat_min*60); ?><?=$gps_vars[4]; ?>) </td> <td> - <?=printf("%.5f", $gps_lon); ?> (<?=printf("%d", $gps_lon_deg); ?>° <?=printf("%.5f", $gps_lon_min*60); ?><?=$gps_vars[6]; ?>) + <?=sprintf("%.5f", $gps_lon); ?> (<?=sprintf("%d", $gps_lon_deg); ?>° <?=sprintf("%.5f", $gps_lon_min*60); ?><?=$gps_vars[6]; ?>) </td> <?php diff --git a/src/usr/local/www/status_pkglogs.php b/src/usr/local/www/status_pkglogs.php index 3687965..aa63ee1 100755 --- a/src/usr/local/www/status_pkglogs.php +++ b/src/usr/local/www/status_pkglogs.php @@ -126,7 +126,7 @@ if ($pkgwithlogging == false) { ?> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=printf(gettext('Last %1$s %2$s Log Entries'), $nentries, $curtab)?></h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=sprintf(gettext('Last %1$s %2$s Log Entries'), $nentries, $curtab)?></h2></div> <div class="panel-body"> <pre> <?php |
