|
|
|
@ -8887,6 +8887,21 @@ if %%errorlevel%%==0 NET USE T: \\\\%s\\ftp' %(netbios,netbios,netbios)
|
|
|
|
|
else:
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
@adminConnectLdap
|
|
|
|
|
def isReplMailDNExists(self):
|
|
|
|
|
"""Существуют ли ветка репликации Replication/Mail"""
|
|
|
|
|
if not self.isReplDNExists():
|
|
|
|
|
return False
|
|
|
|
|
sysLogin = self.clVars.Get("ld_ldap_login")
|
|
|
|
|
replLogin = self.clVars.Get("ld_repl_login")
|
|
|
|
|
replMailLogin = self.clVars.Get("ld_repl_mail_login")
|
|
|
|
|
relSysDn = "ou=%s,ou=%s,%s"%(replLogin,sysLogin,self.ServicesDN)
|
|
|
|
|
searchReplDN = self.searchLdapDN(replMailLogin, relSysDn, 'ou')
|
|
|
|
|
if not searchReplDN:
|
|
|
|
|
return False
|
|
|
|
|
else:
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
@adminConnectLdap
|
|
|
|
|
def addSysDN(self):
|
|
|
|
|
"""Добавляет служебную ветку в LDAP если она не существует"""
|
|
|
|
@ -8928,6 +8943,21 @@ if %%errorlevel%%==0 NET USE T: \\\\%s\\ftp' %(netbios,netbios,netbios)
|
|
|
|
|
if self.ldapObj.getError():
|
|
|
|
|
print _("LDAP Error") + ": " + self.ldapObj.getError().strip()
|
|
|
|
|
return False
|
|
|
|
|
# Если ветка Replication/Mail не существует - добавляем ее
|
|
|
|
|
if not self.isReplMailDNExists():
|
|
|
|
|
errorMessage = _("Can not append Replication/Mail branch in LDAP")
|
|
|
|
|
entry = [('objectclass', ['top','organizationalUnit']),
|
|
|
|
|
('ou', ['%s' %self.clVars.Get("ld_repl_mail_login")])]
|
|
|
|
|
try:
|
|
|
|
|
self.conLdap.add_s(self.clVars.Get("ld_repl_mail_dn"),
|
|
|
|
|
entry)
|
|
|
|
|
except ldap.LDAPError, e:
|
|
|
|
|
self.printERROR(_("LDAP Error") + ": " + e[0]['desc'].strip())
|
|
|
|
|
self.printERROR(errorMessage)
|
|
|
|
|
return False
|
|
|
|
|
except:
|
|
|
|
|
self.printERROR(errorMessage)
|
|
|
|
|
return False
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
@adminConnectLdap
|
|
|
|
@ -9754,7 +9784,7 @@ together with option '-r'") + " ...")
|
|
|
|
|
options.has_key('off'):
|
|
|
|
|
if not self.servLdapObj.updateServer({},"samba",self.clVars):
|
|
|
|
|
return False
|
|
|
|
|
# Делаем update сервиса
|
|
|
|
|
# Делаем update сервиса если нет ветки репликации она создается
|
|
|
|
|
if not self.servLdapObj.updateServer({},service,self.clVars):
|
|
|
|
|
return False
|
|
|
|
|
if self.clVars.Get("ld_repl_set") != "on":
|
|
|
|
@ -9800,11 +9830,11 @@ together with option '-r'") + " ...")
|
|
|
|
|
for name, mails in usersAndGroupsMail:
|
|
|
|
|
if self.searchMailAlias(name):
|
|
|
|
|
if not self.modReplMailAlias(name, mails):
|
|
|
|
|
flagError = False
|
|
|
|
|
flagError = True
|
|
|
|
|
break
|
|
|
|
|
else:
|
|
|
|
|
if not self.addReplMailAlias(name, mails):
|
|
|
|
|
flagError = False
|
|
|
|
|
flagError = True
|
|
|
|
|
break
|
|
|
|
|
if flagError:
|
|
|
|
|
self.printERROR(_("Can not set replication mail alias,") +\
|
|
|
|
|