diff options
| author | Chris Buechler <cmb@pfsense.org> | 2009-08-20 17:47:47 -0400 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2009-08-20 17:47:47 -0400 |
| commit | 515ac0f0665a350dcae8a0dd8010701e683a83fe (patch) | |
| tree | c09ab83a8ec99dcdb21874a6648385579c70a11b /usr/local/www/diag_showbogons.php | |
| parent | e49dc1bd4ba698bb8e898eb92d79722b973e682e (diff) | |
| download | pfsense-515ac0f0665a350dcae8a0dd8010701e683a83fe.zip pfsense-515ac0f0665a350dcae8a0dd8010701e683a83fe.tar.gz | |
fix merge mess
Diffstat (limited to 'usr/local/www/diag_showbogons.php')
| -rw-r--r-- | usr/local/www/diag_showbogons.php | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/usr/local/www/diag_showbogons.php b/usr/local/www/diag_showbogons.php index 738122e..541e8e0 100644 --- a/usr/local/www/diag_showbogons.php +++ b/usr/local/www/diag_showbogons.php @@ -37,18 +37,7 @@ require("guiconfig.inc"); if($_POST['Download']) { -<<<<<<< HEAD mwexec_bg("/etc/rc.update_bogons.sh now"); -======= - exec("touch /var/run/donotsleep_bogons"); - conf_mount_rw(); - exec("/usr/bin/fetch -q -o /tmp/bogons 'http://files.pfsense.org/bogon-bn-nonagg.txt'"); - if(file_exists("/tmp/bogons")) { - $savemsg = "The bogons database has been updated."; - exec("egrep -v '^192.168.0.0/16|^172.16.0.0/12|^10.0.0.0/8' /tmp/bogons > /etc/bogons"); - exec("rm /tmp/bogons"); - } ->>>>>>> acf23e63aceb182a748f1f618bf87957747d7886 } $bogons = `cat /etc/bogons`; |
