From: Alexander Marx <amarx@ipfire.org>
Date: Sat, 2 Mar 2013 11:48:11 +0000 (+0100)
Subject: ovpnmain.cgi: Change check for pushed dhcp domains.
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=81da1b01e95ec7a99513116f816b1fc9ef500b2a;hp=30086585ed63e0e1a3cf3a3dc967414af962fa4d

ovpnmain.cgi: Change check for pushed dhcp domains.

The Domainname is now checked against validdomainname instead of validfqdn,
so there's no need of a dotted domainname anymore.

Fixes #10262.
---

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 58ebdf2fa..82e83d61b 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -863,7 +863,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) {
     }
 		
     if ($cgiparams{'DHCP_DOMAIN'} ne ''){
-	unless (&General::validfqdn($cgiparams{'DHCP_DOMAIN'}) || &General::validip($cgiparams{'DHCP_DOMAIN'})) {
+	unless (&General::validdomainname($cgiparams{'DHCP_DOMAIN'}) || &General::validip($cgiparams{'DHCP_DOMAIN'})) {
 		$errormessage = $Lang::tr{'invalid input for dhcp domain'};
 	goto ADV_ERROR;
     	}