git-svn-id: http://svn.calculate.ru/calculate2/calculate-server/trunk@417 c91db197-33c1-4113-bf15-f8a5c547ca64

pym/cl_ldap.py

@@ -3958,8 +3958,11 @@ class servSamba(shareLdap):
             else:
                 return False
         resSearch = self.servUnixObj.searchUnixUser(userName)
+        flagFoundPasswd = False
         if not resSearch:
             resSearch = self.servUnixObj.searchPasswdUser(userName)
+            flagFoundPasswd = True
+
             ## создание пользователя Unix опция f
             #if not resSearch and not options.has_key('f'):
                 #self.printERROR(
@@ -3999,7 +4002,7 @@ class servSamba(shareLdap):
                                  str(userName) + _(" in Unix service"))
                 return False
             flagCreateUnixUser = True
-        elif userPwd:
+        elif userPwd and not flagFoundPasswd:
             if not self.servUnixObj.modUserUnixPasswd(userName, {}, userPwd):
                 return False
         if userPwd: