From 7528fc099038735a79a64e9fc32af12b3c98b114 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Thu, 10 May 2007 15:56:29 +0000
Subject: Patch from Martin to fix
 http://forum.pfsense.org/index.php/topic,4773.0.html

---
 etc/inc/openvpn.inc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'etc')

diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc
index a388335..7205019 100644
--- a/etc/inc/openvpn.inc
+++ b/etc/inc/openvpn.inc
@@ -89,22 +89,26 @@ function openvpn_validate_input($mode, $post, $input_errors) {
 			$input_errors[] = $result;
 
 // DHCP-Options logic-check
+	if (!empty($post['dhcp_dns'])) {
     $servers = explode(';', $post['dhcp_dns']);
       foreach ($servers as $server) if (!is_ipaddr($server)) 
         {$input_errors[] = 'The field \'DHCP-Opt.: DNS-Server\' must contain a valid IP address and no whitespaces.';
-        break;}
+        break;}}
+	if (!empty($post['dhcp_wins'])) {
     $servers = explode(';', $post['dhcp_wins']);
       foreach ($servers as $server) if (!is_ipaddr($server)) 
         {$input_errors[] = 'The field \'DHCP-Opt.: WINS-Server\' must contain a valid IP address and no whitespaces.';
-        break;}
+        break;}}
+	if (!empty($post['dhcp_nbdd'])) {
     $servers = explode(';', $post['dhcp_nbdd']);
       foreach ($servers as $server) if (!is_ipaddr($server)) 
         {$input_errors[] = 'The field \'DHCP-Opt.: NBDD-Server\' must contain a valid IP address and no whitespaces.';
-        break;}
+        break;}}
+	if (!empty($post['dhcp_ntp'])) {
     $servers = explode(';', $post['dhcp_ntp']);
       foreach ($servers as $server) if (!is_ipaddr($server)) 
         {$input_errors[] = 'The field \'DHCP-Opt.: NTP-Server\' must contain a valid IP address and no whitespaces.';
-        break;}     
+        break;}}
 
 	}
 
-- 
cgit v1.1