modified method servDhcp.getFullHostNameInConfig()

pym/cl_ldap.py

@@ -18972,11 +18972,21 @@ class servDhcp(shareLdap, shareIP):
             %dhcpObj.nameConfigFile)
             return False
         flagError = False
-        ipRp = ip.rpartition(".")[0]
+        isRange = lambda n, minN, maxN: minN<=n<=maxN
+        domainNames = []
         for net, data in dataNets:
+            try:
+                netAndMask = self.getNet(net, data["mask"][0])
+            except:
+                self.printERROR(_('Incorrect netmask "%s" in')\
+                %data["mask"][0] +\
+                " " + _("in config file %s") %dhcpObj.nameConfigFile)
+                flagError = True
+                break
+            minNumber, maxNumber = self.getMinAndMaxIpNumb(netAndMask)
+            ipNumb = self.getNumberIP(ip)
             domainNames = []
-            if ipRp == net.rpartition(".")[0]:
-                netFound = True
+            if isRange(ipNumb, minNumber, maxNumber):
                 if data.has_key("optiondomain-name"):
                     domainNames = map(lambda x: x.strip().replace('"',''),\
                                     data["optiondomain-name"])
@@ -20189,8 +20199,8 @@ network %s")%net)
                 ip = data["fixed-address"][0]
                 # Полное имя хоста
                 fullDomainName = ""
+                isRange = lambda n, minN, maxN: minN<=n<=maxN
                 for netAndMask, zone in allNets:
-                    isRange = lambda n, minN, maxN: minN<=n<=maxN
                     minNumber, maxNumber = self.getMinAndMaxIpNumb(netAndMask)
                     ipNumb = self.getNumberIP(ip)
                     if isRange(ipNumb, minNumber, maxNumber):