]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
ovpnmain.cgi: Change check for pushed dhcp domains.
authorAlexander Marx <amarx@ipfire.org>
Sat, 2 Mar 2013 11:48:11 +0000 (12:48 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sun, 3 Mar 2013 12:23:49 +0000 (13:23 +0100)
The Domainname is now checked against validdomainname instead of validfqdn,
so there's no need of a dotted domainname anymore.

Fixes #10262.

html/cgi-bin/ovpnmain.cgi

index 58ebdf2faea0d22e0a92e9daad768381a8c2d390..82e83d61b3e6a8bfeb052c53aa52f62ace776e02 100644 (file)
@@ -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;
        }