|
|
|
@ -10573,13 +10573,26 @@ if %%errorlevel%%==0 NET USE T: \\\\%s\\ftp' %(netbios,netbios,netbios)
|
|
|
|
|
return resSearch
|
|
|
|
|
|
|
|
|
|
@adminConnectLdap
|
|
|
|
|
def delReplWorkedUser(self, userName):
|
|
|
|
|
def delReplWorkedUser(self, userName, fullDel=True):
|
|
|
|
|
"""Удаляет пользователя из ветки Worked"""
|
|
|
|
|
if self.searchWorkedUser(userName):
|
|
|
|
|
relWorkedDN = self.getRelWorkedDN()
|
|
|
|
|
flagError = False
|
|
|
|
|
# Полное удаление пользователя из ветки
|
|
|
|
|
relWorkedDN = self.getRelWorkedDN()
|
|
|
|
|
if fullDel:
|
|
|
|
|
foundUsers = self.searchWorkedUser(userName+"@*")
|
|
|
|
|
if foundUsers:
|
|
|
|
|
deleteUserNames = map(lambda x: x[0][1]["uid"][0], foundUsers)
|
|
|
|
|
for delUser in deleteUserNames:
|
|
|
|
|
delDN = self.addDN("uid=" + delUser, relWorkedDN)
|
|
|
|
|
if not self.delDN(delDN):
|
|
|
|
|
flagError = True
|
|
|
|
|
break
|
|
|
|
|
if not flagError and self.searchWorkedUser(userName):
|
|
|
|
|
delDN = self.addDN("uid=" + userName, relWorkedDN)
|
|
|
|
|
if not self.delDN(delDN):
|
|
|
|
|
return False
|
|
|
|
|
flagError = True
|
|
|
|
|
if flagError:
|
|
|
|
|
return False
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
@adminConnectLdap
|
|
|
|
@ -10846,12 +10859,25 @@ if %%errorlevel%%==0 NET USE T: \\\\%s\\ftp' %(netbios,netbios,netbios)
|
|
|
|
|
else:
|
|
|
|
|
clientOs = os.path.split(dirLogOut)[1].\
|
|
|
|
|
replace(".","")
|
|
|
|
|
# если есть старый пользователь в ветке Worked
|
|
|
|
|
# и клиентская систем CLD - удаляем старого
|
|
|
|
|
# пользователя
|
|
|
|
|
if self.searchWorkedUser(login) and\
|
|
|
|
|
clientOs=="CLD":
|
|
|
|
|
# Удаляем конкретного пользователя
|
|
|
|
|
# второй параметр False
|
|
|
|
|
if not self.delReplWorkedUser(login,
|
|
|
|
|
False):
|
|
|
|
|
errMessages.append(_("Can not remove \
|
|
|
|
|
user %s in the LDAP branch 'Worked'")%str(login))
|
|
|
|
|
errorFlag = True
|
|
|
|
|
userLogin = "%s@%s"%(login,clientOs)
|
|
|
|
|
# Добавляем пользователя в ветку репликации
|
|
|
|
|
if not self.addReplWorkedUser(userLogin):
|
|
|
|
|
errorFlag = True
|
|
|
|
|
errMessages.append(_("Can not add user %s in \
|
|
|
|
|
LDAP branch 'Replication'")%str(login))
|
|
|
|
|
if not errorFlag:
|
|
|
|
|
# Добавляем пользователя в ветку репликации
|
|
|
|
|
if not self.addReplWorkedUser(userLogin):
|
|
|
|
|
errorFlag = True
|
|
|
|
|
errMessages.append(_("Can not add user %s \
|
|
|
|
|
in LDAP branch 'Replication'")%str(login))
|
|
|
|
|
else:
|
|
|
|
|
errorFlag = True
|
|
|
|
|
errMessages.append(_("Samba user %s is not found")%str(login))
|
|
|
|
|