Return-Path: X-Original-To: apmail-cloudstack-dev-archive@www.apache.org Delivered-To: apmail-cloudstack-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2042A18184 for ; Tue, 1 Sep 2015 09:13:51 +0000 (UTC) Received: (qmail 57443 invoked by uid 500); 1 Sep 2015 09:13:50 -0000 Delivered-To: apmail-cloudstack-dev-archive@cloudstack.apache.org Received: (qmail 57387 invoked by uid 500); 1 Sep 2015 09:13:50 -0000 Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list dev@cloudstack.apache.org Received: (qmail 57376 invoked by uid 99); 1 Sep 2015 09:13:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Sep 2015 09:13:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6B46DDFE5A; Tue, 1 Sep 2015 09:13:50 +0000 (UTC) From: karuturi To: dev@cloudstack.apache.org Reply-To: dev@cloudstack.apache.org References: In-Reply-To: Subject: [GitHub] cloudstack pull request: Cloudstack:8647 LDAP Trust AD and Autoimp... Content-Type: text/plain Message-Id: <20150901091350.6B46DDFE5A@git1-us-west.apache.org> Date: Tue, 1 Sep 2015 09:13:50 +0000 (UTC) Github user karuturi commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/755#discussion_r38399252 --- Diff: server/src/com/cloud/user/AccountManagerImpl.java --- @@ -2145,14 +2145,10 @@ private UserAccount getUserAccount(String username, String password, Long domain s_logger.debug("Attempting to log in user: " + username + " in domain " + domainId); } UserAccount userAccount = _userAccountDao.getUserAccount(username, domainId); - if (userAccount == null) { - s_logger.warn("Unable to find an user with username " + username + " in domain " + domainId); - return null; - } boolean authenticated = false; HashSet actionsOnFailedAuthenticaion = new HashSet(); - User.Source userSource = userAccount.getSource(); + User.Source userSource = userAccount != null ? userAccount.getSource(): User.Source.UNKNOWN; --- End diff -- Ldap imported user will not have the source as unknown. If does, it will continue to check in other authenticators and if they return success, user will be authenticated. Thats an existing behaviour which is not changed by this PR. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---