diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2013-01-30 17:07:57 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2013-01-30 17:08:28 -0200 |
| commit | 0a0b17d90dd59ae1a743408bd0a67baa1f8f2ec9 (patch) | |
| tree | 3b7e61725fe7431d8c3df8ec6b17a510ace95dfe | |
| parent | a1613b62bb796f5714ff3e8bfc019dbf5d798e5c (diff) | |
| download | pfsense-0a0b17d90dd59ae1a743408bd0a67baa1f8f2ec9.zip pfsense-0a0b17d90dd59ae1a743408bd0a67baa1f8f2ec9.tar.gz | |
Avoid mpd based services to set localip to an already used IP on the system. It should fix #1723
| -rw-r--r-- | usr/local/www/vpn_l2tp.php | 3 | ||||
| -rwxr-xr-x | usr/local/www/vpn_pptp.php | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/usr/local/www/vpn_l2tp.php b/usr/local/www/vpn_l2tp.php index 699e468..cedcef5 100644 --- a/usr/local/www/vpn_l2tp.php +++ b/usr/local/www/vpn_l2tp.php @@ -84,6 +84,9 @@ if ($_POST) { if (($_POST['localip'] && !is_ipaddr($_POST['localip']))) { $input_errors[] = gettext("A valid server address must be specified."); } + if (is_ipaddr_configured($_POST['localip'])) { + $input_errors[] = gettext("'Server address' parameter should NOT be set to any IP address currently in use on this firewall."); + } if (($_POST['l2tp_subnet'] && !is_ipaddr($_POST['remoteip']))) { $input_errors[] = gettext("A valid remote start address must be specified."); } diff --git a/usr/local/www/vpn_pptp.php b/usr/local/www/vpn_pptp.php index 59404c1..a5da316 100755 --- a/usr/local/www/vpn_pptp.php +++ b/usr/local/www/vpn_pptp.php @@ -92,6 +92,9 @@ if ($_POST) { if (($_POST['localip'] && !is_ipaddr($_POST['localip']))) { $input_errors[] = gettext("A valid server address must be specified."); } + if (is_ipaddr_configured($_POST['localip'])) { + $input_errors[] = gettext("'Server address' parameter should NOT be set to any IP address currently in use on this firewall."); + } if (!is_ipaddr($_POST['remoteip'])) { $input_errors[] = gettext("A valid remote start address must be specified."); } |
