[MERGE] base_crypt: missing import and better check for active users

lp bug: https://launchpad.net/bugs/775431 fixed

bzr revid: odo@openerp.com-20110502112425-w8hu16xd81o6f6gk

addons/base_crypt/crypt.py

@@ -41,6 +41,7 @@ from string import ascii_letters, digits
 from osv import fields,osv
 import pooler
 from tools.translate import _
+from service import security
 
 magic_md5 = '$1$'
 
@@ -184,7 +185,7 @@ class users(osv.osv):
                 cr.close()
 
     def _login(self, cr, db, login, password):
-        cr.execute( 'SELECT password, id FROM res_users WHERE login=%s',
+        cr.execute( 'SELECT password, id FROM res_users WHERE login=%s AND active',
             (login.encode('utf-8'),))
 
         if cr.rowcount:
@@ -249,7 +250,7 @@ class users(osv.osv):
                     raise security.ExceptionNoTb('AccessDenied')
             else:
                 salt = self._salt_cache[db][uid]
-                cr.execute('SELECT COUNT(*) FROM res_users WHERE id=%s AND password=%s', 
+                cr.execute('SELECT COUNT(*) FROM res_users WHERE id=%s AND password=%s AND active', 
                     (int(uid), encrypt_md5(passwd, salt)))
                 res = cr.fetchone()[0]
         finally: