# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 1324681623 -7200
# Node ID ff788e390497fafe2077cf0f87167ac3efebc943
# Parent  1635a21485d66f426554e1829be3d9eed4d3b488
fix issue #323 auth by suername only if container auth is enabled

diff -r 1635a21485d6 -r ff788e390497 rhodecode/lib/auth.py
--- a/rhodecode/lib/auth.py	Fri Dec 23 04:47:48 2011 +0200
+++ b/rhodecode/lib/auth.py	Sat Dec 24 01:07:03 2011 +0200
@@ -316,8 +316,10 @@
               self.user_id != self.anonymous_user.user_id):
             log.debug('Auth User lookup by USER ID %s', self.user_id)
             is_user_loaded = user_model.fill_data(self, user_id=self.user_id)
-        # lookup by username    
-        elif self.username:
+        # lookup by username
+        elif self.username and \
+            str2bool(config.get('container_auth_enabled', False)):
+            
             log.debug('Auth User lookup by USER NAME %s', self.username)
             dbuser = login_container_auth(self.username)
             if dbuser is not None: