diff --git a/pym/cl_ldap.py b/pym/cl_ldap.py index e93f612..fc5e489 100644 --- a/pym/cl_ldap.py +++ b/pym/cl_ldap.py @@ -6622,7 +6622,6 @@ class servFtp(shareLdap): userPwdHash =\ self.execProg("slappasswd -s %s -h %s"\ %(userPwd, self.userCrypt)) - userPwdHash = userPwd if resSearch[0][0][1].has_key('userPassword'): modAttrs.append((ldap.MOD_REPLACE, 'userPassword', userPwdHash)) @@ -6630,7 +6629,7 @@ class servFtp(shareLdap): modAttrs.append((ldap.MOD_ADD, 'userPassword', userPwdHash)) if modAttrs: - uid = res[0][0][1]['uid'][0] + uid = resSearch[0][0][1]['uid'][0] DN = self.addDN("uid="+uid, self.relUsersDN) if not self.modAttrsDN(DN, modAttrs): return False diff --git a/scripts/cl-usermod b/scripts/cl-usermod index b6da74a..7da2010 100644 --- a/scripts/cl-usermod +++ b/scripts/cl-usermod @@ -53,6 +53,11 @@ if __name__ == "__main__": # Добавляем Mail пользователя if obj.modUserJabberServer(optObj.params['user'], optObj.opt): flagError = False + elif optObj.params['service'] == "ftp": + obj = cl_ldap.servFtp() + # Добавляем FTP пользователя + if obj.modUserFtpServer(optObj.params['user'], optObj.opt): + flagError = False if flagError: sys.exit(1) else: