From c57b06c7332e4a9ce95c38187d5e3a0cb343a522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B0=D0=BC=D0=BE=D1=83=D0=BA=D0=B8=D0=BD=20=D0=90?= =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Thu, 5 Aug 2010 09:15:53 +0000 Subject: [PATCH] Changed the method of entering the password --- pym/cl_client.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pym/cl_client.py b/pym/cl_client.py index 0f10adf..b9394cd 100644 --- a/pym/cl_client.py +++ b/pym/cl_client.py @@ -1922,18 +1922,44 @@ class client(share, commandServer, encrypt): self.printERROR(_("The computer is not in domain")) self.printWARNING(_("Use passwd")) return False + count = 2 # Получаем старый пароль пользователя curPassword = self.getUserPassword(_("Enter current password")) if not curPassword: self.printERROR(_("Current password is empty")) + for i in range(count): + count -= 1 + # Получаем старый пароль пользователя + curPassword = self.getUserPassword(_("Enter current password")) + if curPassword: + break + self.printERROR(_("Current password is empty")) + if not curPassword: return False userDN = self.ldapDataObj.addDN("uid=%s"%os.environ["USER"], usersDN) # Проверяем в LDAP сервере текущий пароль пользователя ret, err = self.checkUserPwdLDAP(server, userDN, curPassword) if not ret: self.printERROR(err) + for i in range(count): + # Получаем старый пароль пользователя + curPassword = self.getUserPassword(_("Enter current password")) + if not curPassword: + self.printERROR(_("Current password is empty")) + continue + # Проверяем в LDAP сервере текущий пароль пользователя + ret, err = self.checkUserPwdLDAP(server, userDN, curPassword) + if ret: + break + self.printERROR(err) + if not ret: return False password = self.getUserPwd({"p":""}, "p", False) + if password is False: + for i in range(2): + password = self.getUserPwd({"p":""}, "p", False) + if password: + break if password is False: return False # Переменные для записи в env файл