# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2010-11-24 02:31:33
# Node ID 88338675a0f7d84f317838b0805f5e587dcd4eb6
# Parent  2f89beda06a1fde047755b8f152a83bda7b9d65d

fixed ldap issue and small template fix

diff --git a/rhodecode/lib/auth.py b/rhodecode/lib/auth.py
--- a/rhodecode/lib/auth.py
+++ b/rhodecode/lib/auth.py
@@ -109,9 +109,9 @@ def authfunc(environ, username, password
         username = username.lower()
         user_obj = user_model.get_by_username(username, cache=False,
                                             case_insensitive=True)
-        if user_obj is not None:
-            return False 
-        
+        if user_obj is not None and user_obj.is_ldap is False:
+            return False
+
         from rhodecode.model.settings import SettingsModel
         ldap_settings = SettingsModel().get_ldap_settings()
 
@@ -119,7 +119,7 @@ def authfunc(environ, username, password
         # FALLBACK TO LDAP AUTH IN ENABLE                
         #======================================================================
         if ldap_settings.get('ldap_active', False):
-            
+
             kwargs = {
                   'server':ldap_settings.get('ldap_host', ''),
                   'base_dn':ldap_settings.get('ldap_base_dn', ''),
diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css
--- a/rhodecode/public/css/style.css
+++ b/rhodecode/public/css/style.css
@@ -2317,7 +2317,7 @@ display:block;
 color:red;
 margin:8px 0 0;
 padding:0;
-width: 320px;
+max-width: 320px;
 }
 
 #login div.form div.fields div.field div.label label,#register div.form div.fields div.field div.label label {