|
|
|
@ -1129,9 +1129,11 @@ in a sambaDomainName',
|
|
|
|
|
return False
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
def unicList(self, lst):
|
|
|
|
|
"""Список уникальных элементов из списка не уникальных"""
|
|
|
|
|
return list(set(lst))
|
|
|
|
|
def unicList(self, listEl):
|
|
|
|
|
"""Уникальный список с сохранением порядка"""
|
|
|
|
|
retList = []
|
|
|
|
|
[not x in retList and retList.append(x) for x in listEl]
|
|
|
|
|
return retList
|
|
|
|
|
|
|
|
|
|
def setJpegPhotoUser(self, userName, photoPath, attr="uid"):
|
|
|
|
|
"""Добавляем jpeg фотографию пользователя в LDAP"""
|
|
|
|
@ -15910,14 +15912,6 @@ class servDns(shareLdap):
|
|
|
|
|
searchFilter, retrieveAttributes)
|
|
|
|
|
return resSearch
|
|
|
|
|
|
|
|
|
|
def _unicList(self, listEl):
|
|
|
|
|
"""Уникальный список с сохранением порядка"""
|
|
|
|
|
retList = []
|
|
|
|
|
for el in listEl:
|
|
|
|
|
if not el in retList:
|
|
|
|
|
retList.append(el)
|
|
|
|
|
return retList
|
|
|
|
|
|
|
|
|
|
def _getRelZoneBaseDN(self, zoneName, opt="ZonesDN"):
|
|
|
|
|
"""Выдает
|
|
|
|
|
|
|
|
|
@ -16634,7 +16628,7 @@ incompatible with reverse DNS zone %s')%zoneName)
|
|
|
|
|
if options.has_key('mx'):
|
|
|
|
|
zoneListMX = map(lambda x: delDot(x.lower()),\
|
|
|
|
|
options['mx'].split(","))
|
|
|
|
|
zoneListMX = self._unicList(zoneListMX)
|
|
|
|
|
zoneListMX = self.unicList(zoneListMX)
|
|
|
|
|
if not self.checkMXDomains(zoneListMX):
|
|
|
|
|
return False
|
|
|
|
|
# Все авторитативные сервера зоны, в случае slаve зоны
|
|
|
|
@ -17049,7 +17043,7 @@ with option "--mxmod"')
|
|
|
|
|
if options.has_key('mx'):
|
|
|
|
|
mxServers=map(lambda x: delDot(x.lower()),
|
|
|
|
|
options['mx'].split(","))
|
|
|
|
|
mxServers = self._unicList(mxServers)
|
|
|
|
|
mxServers = self.unicList(mxServers)
|
|
|
|
|
# Переименование mx записи
|
|
|
|
|
# modMxServers[0] - cтарая запись
|
|
|
|
|
# modMxServers[1] - новая запись
|
|
|
|
@ -17057,7 +17051,7 @@ with option "--mxmod"')
|
|
|
|
|
if options.has_key('mxmod'):
|
|
|
|
|
modMxServers=map(lambda x: delDot(x.lower()),\
|
|
|
|
|
options['mxmod'].split(","))
|
|
|
|
|
modMxServers = self._unicList(modMxServers)
|
|
|
|
|
modMxServers = self.unicList(modMxServers)
|
|
|
|
|
if len(modMxServers)!=2:
|
|
|
|
|
self.printERROR(_('Incorrect command line options "--mxmod"'))
|
|
|
|
|
self.printWARNING(_("Example") + ":")
|
|
|
|
@ -17391,7 +17385,7 @@ incompatible with CNAME record (options "-t")'))
|
|
|
|
|
return False
|
|
|
|
|
mxServers=map(lambda x: delDot(x.lower()),
|
|
|
|
|
options['mx'].split(","))
|
|
|
|
|
mxServers = self._unicList(mxServers)
|
|
|
|
|
mxServers = self.unicList(mxServers)
|
|
|
|
|
# Переименование mx записи
|
|
|
|
|
# modMxServers[0] - cтарая запись
|
|
|
|
|
# modMxServers[1] - новая запись
|
|
|
|
@ -17410,7 +17404,7 @@ incompatible with CNAME record (options "-t")'))
|
|
|
|
|
return False
|
|
|
|
|
modMxServers=map(lambda x: delDot(x.lower()),\
|
|
|
|
|
options['mxmod'].split(","))
|
|
|
|
|
modMxServers = self._unicList(modMxServers)
|
|
|
|
|
modMxServers = self.unicList(modMxServers)
|
|
|
|
|
if len(modMxServers)!=2:
|
|
|
|
|
self.printERROR(_('Incorrect command line options "--mxmod"'))
|
|
|
|
|
self.printWARNING(_("Example") + ":")
|
|
|
|
@ -18302,7 +18296,7 @@ with type DNS record PTR (options "-t")'))
|
|
|
|
|
return False
|
|
|
|
|
mxServers = map(lambda x: delDot(x.lower()),\
|
|
|
|
|
options['mx'].split(","))
|
|
|
|
|
mxServers = self._unicList(mxServers)
|
|
|
|
|
mxServers = self.unicList(mxServers)
|
|
|
|
|
ret = False
|
|
|
|
|
# Флаг создания A записи
|
|
|
|
|
flagCreateARecord = False
|
|
|
|
@ -19010,7 +19004,7 @@ eth0, eth1, ... etc."%net)
|
|
|
|
|
if options.has_key("dnames"):
|
|
|
|
|
# доменные имена для поиска
|
|
|
|
|
domainNames = map(lambda x: x.lower(), options["dnames"].split(","))
|
|
|
|
|
domainNames = self._unicList(domainNames)
|
|
|
|
|
domainNames = self.unicList(domainNames)
|
|
|
|
|
# проверка доменных имен на ip
|
|
|
|
|
incorrectDomains = filter(lambda x:\
|
|
|
|
|
self.isCorrectStringNet(x, False), domainNames)
|
|
|
|
@ -19239,7 +19233,7 @@ eth0, eth1, ... etc."%net)
|
|
|
|
|
domainNames = []
|
|
|
|
|
if options.has_key("dnames"):
|
|
|
|
|
domainNames = map(lambda x: x.lower(), options["dnames"].split(","))
|
|
|
|
|
domainNames = self._unicList(domainNames)
|
|
|
|
|
domainNames = self.unicList(domainNames)
|
|
|
|
|
# проверка доменных имен на ip
|
|
|
|
|
incorrectDomains = filter(lambda x:\
|
|
|
|
|
self.isCorrectStringNet(x, False), domainNames)
|
|
|
|
@ -20115,14 +20109,6 @@ network %s")%net)
|
|
|
|
|
else:
|
|
|
|
|
return []
|
|
|
|
|
|
|
|
|
|
def _unicList(self, listEl):
|
|
|
|
|
"""Уникальный список с сохранением порядка"""
|
|
|
|
|
retList = []
|
|
|
|
|
for el in listEl:
|
|
|
|
|
if not el in retList:
|
|
|
|
|
retList.append(el)
|
|
|
|
|
return retList
|
|
|
|
|
|
|
|
|
|
def setupDhcpServer(self, options):
|
|
|
|
|
"""Начальная настройка DHCP сервиса"""
|
|
|
|
|
# Принудительная установка
|
|
|
|
|