Return-Path: Delivered-To: apmail-roller-commits-archive@www.apache.org Received: (qmail 16503 invoked from network); 26 Sep 2009 15:34:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 26 Sep 2009 15:34:42 -0000 Received: (qmail 75174 invoked by uid 500); 26 Sep 2009 15:34:42 -0000 Delivered-To: apmail-roller-commits-archive@roller.apache.org Received: (qmail 75149 invoked by uid 500); 26 Sep 2009 15:34:42 -0000 Mailing-List: contact commits-help@roller.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@roller.apache.org Delivered-To: mailing list commits@roller.apache.org Received: (qmail 75140 invoked by uid 99); 26 Sep 2009 15:34:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Sep 2009 15:34:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Sep 2009 15:34:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 730E82388906; Sat, 26 Sep 2009 15:34:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r819155 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java Date: Sat, 26 Sep 2009 15:34:18 -0000 To: commits@roller.apache.org From: gangolli@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090926153418.730E82388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gangolli Date: Sat Sep 26 15:34:18 2009 New Revision: 819155 URL: http://svn.apache.org/viewvc?rev=819155&view=rev Log: Fix for ROL-1611. Use proper default for UID attribute. Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java?rev=819155&r1=819154&r2=819155&view=diff ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/security/CustomUserRegistry.java Sat Sep 26 15:34:18 2009 @@ -85,7 +85,7 @@ if(authentication == null) { // Try to get SSO data from HttpServletRequest - userName = getRequestAttribute(request, WebloggerConfig.getProperty(UID_LDAP_PROPERTY, DEFAULT_SNAME_LDAP_ATTRIBUTE)); + userName = getRequestAttribute(request, WebloggerConfig.getProperty(UID_LDAP_PROPERTY, DEFAULT_UID_LDAP_ATTRIBUTE)); screenName = getRequestAttribute(request, WebloggerConfig.getProperty(SNAME_LDAP_PROPERTY, DEFAULT_SNAME_LDAP_ATTRIBUTE));