calculate/calculate-utils-2.1-server
4
0
Fork 0
Code Issues 3 Pull requests Releases 1 Wiki Activity

fixed addReplDN

Browse source
This commit is contained in:
Иван Дзюбенко 2021-09-24 18:05:44 +03:00
parent ae07b11159
commit 52e217f20b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pym/cl_ldap.py
View file

@ -12579,8 +12579,8 @@ if %%errorlevel%%==0 NET USE T: \\\\%s\\ftp' %(netbios,netbios,netbios)
# Если ветка Replication/Mail не существует - добавляем ее # Если ветка Replication/Mail не существует - добавляем ее
if not self.isReplMailDNExists(): if not self.isReplMailDNExists():
errorMessage = _("Can not append Replication/Mail branch in LDAP") errorMessage = _("Can not append Replication/Mail branch in LDAP")
entry = [('objectclass', ['top','organizationalUnit']), entry = [('objectclass', [b'top', b'organizationalUnit']),
('ou', ['%s' %self.clVars.Get("ld_repl_mail_login")])] ('ou', [b'%s' % self.clVars.Get("ld_repl_mail_login").encode("UTF-8")])]
try: try:
self.conLdap.add_s(self.clVars.Get("ld_repl_mail_dn"), self.conLdap.add_s(self.clVars.Get("ld_repl_mail_dn"),
entry) entry)
@ -12594,8 +12594,8 @@ if %%errorlevel%%==0 NET USE T: \\\\%s\\ftp' %(netbios,netbios,netbios)
# Если ветка Replication/Worked не существует - добавляем ее # Если ветка Replication/Worked не существует - добавляем ее
if not self.isReplWorkedDNExists(): if not self.isReplWorkedDNExists():
errorMessage = _("Can not append Replication/Worked branch in LDAP") errorMessage = _("Can not append Replication/Worked branch in LDAP")
entry = [('objectclass', ['top','organizationalUnit']), entry = [('objectclass', [b'top', b'organizationalUnit']),
('ou', ['%s' %self.clVars.Get("ld_repl_worked_login")])] ('ou', [b'%s' % self.clVars.Get("ld_repl_worked_login").encode("UTF-8")])]
try: try:
self.conLdap.add_s(self.clVars.Get("ld_repl_worked_dn"), self.conLdap.add_s(self.clVars.Get("ld_repl_worked_dn"),
entry) entry)
@ -15793,7 +15793,7 @@ or '-P')"))
groupGecos = self.servUnixObj.groupGecos groupGecos = self.servUnixObj.groupGecos
if 'c' in options: if 'c' in options:
groupGecos = options['c'] groupGecos = options['c']
self.clVars.Set("ur_group_comment",groupGecos) self.clVars.Set("ur_group_comment", groupGecos)
# Тип группы # Тип группы
groupType = "port" groupType = "port"
accessPorts = "" accessPorts = ""
@ -15901,7 +15901,7 @@ is not valid ") %accessPorts)
# Берем комментарий для пользователя из Unix # Берем комментарий для пользователя из Unix
if resUnix and 'cn' in resUnix[0][0][1]: if resUnix and 'cn' in resUnix[0][0][1]:
fullNameUser = resUnix[0][0][1]['cn'][0].decode("UTF-8") fullNameUser = resUnix[0][0][1]['cn'][0].decode("UTF-8")
self.clVars.Set("ur_fio",fullNameUser) self.clVars.Set("ur_fio", fullNameUser)
ldifFile = self.ldifFileUser ldifFile = self.ldifFileUser
userLdif = self.createLdif(ldifFile) userLdif = self.createLdif(ldifFile)
if not self.ldapObj.getError(): if not self.ldapObj.getError():