git-svn-id: http://svn.calculate.ru/calculate2/calculate-server/trunk@1046 c91db197-33c1-4113-bf15-f8a5c547ca64

pym/cl_fill_server.py

@@ -359,8 +359,14 @@ class fillVars(object, cl_base.glob_attr):
         netAllow = self.Get("sr_samba_net_allow")
         if netAllow:
             netAllow = netAllow.split(",")
+            foundLoc = False
+            for net in netAllow:
+                if net[:4] == '127.':
+                    foundLoc = True
+                    break
             netAllow = " ".join(netAllow)
-            netAllow += " 127."
+            if not foundLoc:
+                netAllow += " 127."
             return netAllow
         osNetAllow = self.Get("os_net_allow")
         if osNetAllow:
@@ -372,8 +378,14 @@ class fillVars(object, cl_base.glob_attr):
         netAllow = self.Get("sr_mail_net_allow")
         if netAllow:
             netAllow = netAllow.split(",")
+            foundLoc = False
+            for net in netAllow:
+                if net[:4] == '127.':
+                    foundLoc = True
+                    break
             netAllow = ", ".join(netAllow)
-            netAllow += ", 127.0.0.0/8"
+            if not foundLoc:
+                netAllow += ", 127.0.0.0/8"
             return netAllow
         osNetAllow = self.Get("os_net_allow")
         if osNetAllow:

pym/cl_ldap.py

@@ -964,7 +964,7 @@ class shareLdap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
         if flagError:
             return False
         else:
-            return networks
+            return list(set(networks))
 
     def getUserAllowNetwork(self, strPrompt, strNetAllow):
         """Получаем от пользователя доверительные сети