Mercurial > kallithea

changeset 1808:ff788e390497 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix issue #323 auth by suername only if container auth is enabled
author Marcin Kuzminski <marcin@python-works.com>
date Sat, 24 Dec 2011 01:07:03 +0200
parents 1635a21485d6
children ef0066e95be5
files rhodecode/lib/auth.py
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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: