Set address before checking for clash
authorJamie Cameron <jcameron@webmin.com>
Fri, 21 Oct 2011 22:44:47 +0000 (15:44 -0700)
committerJamie Cameron <jcameron@webmin.com>
Fri, 21 Oct 2011 22:44:47 +0000 (15:44 -0700)
net/save_aifc.cgi

index 5a0a7e8..e924657 100755 (executable)
@@ -77,6 +77,11 @@ else {
                &error($text{'aifc_ename'});
                }
 
+       # Validate and store inputs
+       &check_ipaddress_any($in{'address'}) ||
+               &error(&text('aifc_eip', $in{'address'}));
+       $a->{'address'} = $in{'address'};
+
        # Check for address clash
        $allow_clash = defined(&allow_interface_clash) ?
                        &allow_interface_clash($a, 0) : 1;
@@ -86,11 +91,6 @@ else {
                $clash && &error(&text('aifc_eclash', $clash->{'fullname'}));
                }
 
-       # Validate and store inputs
-       &check_ipaddress_any($in{'address'}) ||
-               &error(&text('aifc_eip', $in{'address'}));
-       $a->{'address'} = $in{'address'};
-
        if ($virtual_netmask && $a->{'virtual'} ne "") {
                # Always use this netmask for virtuals
                $a->{'netmask'} = $virtual_netmask;