Don't compute broadcast if no address
authorJamie Cameron <jcameron@webmin.com>
Wed, 27 Jan 2010 22:18:11 +0000 (14:18 -0800)
committerJamie Cameron <jcameron@webmin.com>
Wed, 27 Jan 2010 22:18:11 +0000 (14:18 -0800)
net/redhat-linux-lib.pl

index 7eb4dde..3cae8f5 100755 (executable)
@@ -94,8 +94,11 @@ while($f = readdir(CONF)) {
                                ($conf{'ONBOOT'} eq 'yes');
                $b->{'address'} = $conf{'IPADDR'};
                $b->{'netmask'} = $conf{'NETMASK'};
-               $b->{'broadcast'} = $conf{'BROADCAST'} ||
-                   &compute_broadcast($b->{'address'}, $b->{'netmask'});
+               $b->{'broadcast'} = $conf{'BROADCAST'};
+               if (!$b->{'broadcast'} && $b->{'address'} && $b->{'netmask'}) {
+                       $b->{'broadcast'} = &compute_broadcast($b->{'address'},
+                                                              $b->{'netmask'});
+                       }
                $b->{'gateway'} = $conf{'GATEWAY'};
                $b->{'mtu'} = $conf{'MTU'};
                $b->{'ether'} = $conf{'MACADDR'};