浏览代码

Merge pull request #6084 from RussWhitehead/sysAdmin

HPCC-11717 LDAP login for system Admin fails on non-ActiveDirectory

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 11 年之前
父节点
当前提交
02ba26dda1
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      system/security/LdapSecurity/ldapconnection.cpp

+ 2 - 0
system/security/LdapSecurity/ldapconnection.cpp

@@ -1076,6 +1076,8 @@ public:
                 {
                     user.setFullName(m_ldapconfig->getSysUserCommonName());
                     user.setAuthenticateStatus(AS_AUTHENTICATED);
+                    if (m_ldapconfig->getServerType() != ACTIVE_DIRECTORY)
+                        return true;
                     sysUser = true;
                 }
                 else