Merge branch 'master' of git.calculate.ru:calculate2/calculate-client

pym/cl_client.py

@@ -762,10 +762,7 @@ conjunction with the 'login' or 'logout'")
             errMessage = _("Password incorrect")
             return False, errMessage
         except ldap.LDAPError, e:
-            if type(e.message) == dict and e.message.has_key('desc'):
-                errMessage = e.message['desc']
-            else: 
-                errMessage = e
+            errMessage = e[0]['desc']
             return False, errMessage
         return True, errMessage
 
@@ -797,7 +794,10 @@ conjunction with the 'login' or 'logout'")
         except:
             self.printERROR(_("Can not open %s")%fileName)
             return False
-        return (serverName, usersDN)
+        if serverName and usersDN:
+            return (serverName, usersDN)
+	else:
+            return ()
 
 
     def setUserPasswordToServer(self, options):