Ravi Nori has uploaded a new change for review. Change subject: core: Unable to search on domain for users with some search options. ......................................................................
core: Unable to search on domain for users with some search options. Search failed, when try to search user on domain with special keyword. This happens when user search by lastname, department and title. Change-Id: I59396ef6f549b06ccd0bf492c6857db228a23592 Bug-Url: https://bugzilla.redhat.com/975380 Signed-off-by: Ravi Nori <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LDAPTemplateWrapper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/SearchLangageLDAPTokens.java 3 files changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/17267/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LDAPTemplateWrapper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LDAPTemplateWrapper.java index c54437f..63fbdb0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LDAPTemplateWrapper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LDAPTemplateWrapper.java @@ -124,6 +124,9 @@ final SingleContextSource singleContextSource = new SingleContextSource(contextSource.getContext(userName, password)); try { + log.infoFormat("Running LDAP query. BaseDN is {0}, filter is {1}", + baseDN, + displayFilter); ldapTemplate.setContextSource(singleContextSource); if (log.isDebugEnabled()) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java index f936af3..0409bda 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapQueryMetadataFactoryImpl.java @@ -575,6 +575,10 @@ activeDirectorySearchSyntaxMap.put(SearchLangageLDAPTokens.$LDAP_GROUP_CATEGORY, "ObjectCategory=Group"); activeDirectorySearchSyntaxMap.put(SearchLangageLDAPTokens.$CN, "name"); activeDirectorySearchSyntaxMap.put(SearchLangageLDAPTokens.$USER_ACCOUNT_NAME, "samaccountname"); + activeDirectorySearchSyntaxMap.put(SearchLangageLDAPTokens.$SN, "SN"); + activeDirectorySearchSyntaxMap.put(SearchLangageLDAPTokens.$SAMACCOUNTNAME, "SAMACCOUNTNAME"); + activeDirectorySearchSyntaxMap.put(SearchLangageLDAPTokens.$DEPARTMENT, "DEPARTMENT"); + activeDirectorySearchSyntaxMap.put(SearchLangageLDAPTokens.$TITLE, "TITLE"); ipaSearchSyntaxMap = new EnumMap<SearchLangageLDAPTokens, String>(SearchLangageLDAPTokens.class); ipaSearchSyntaxMap.put(SearchLangageLDAPTokens.$GIVENNAME, "givenname"); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/SearchLangageLDAPTokens.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/SearchLangageLDAPTokens.java index b72fa31..360cb5b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/SearchLangageLDAPTokens.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/SearchLangageLDAPTokens.java @@ -6,5 +6,9 @@ $PRINCIPAL_NAME, $LDAP_GROUP_CATEGORY, $CN, - $USER_ACCOUNT_NAME + $USER_ACCOUNT_NAME, + $SAMACCOUNTNAME, + $SN, + $DEPARTMENT, + $TITLE } -- To view, visit http://gerrit.ovirt.org/17267 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59396ef6f549b06ccd0bf492c6857db228a23592 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
