Hello Ravi Nori,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/18403
to review the following change.
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.
Fix for IPA, OpenLDAP and RHDS
Change-Id: I351a8c0e3341a6f975efec210398267aa828c3e0
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/LdapQueryMetadataFactoryImpl.java
1 file changed, 16 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/18403/1
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 0409bda..a02799c 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
@@ -588,6 +588,10 @@
ipaSearchSyntaxMap.put(SearchLangageLDAPTokens.$LDAP_GROUP_CATEGORY,
"objectClass=ipaUserGroup");
ipaSearchSyntaxMap.put(SearchLangageLDAPTokens.$CN, "cn");
ipaSearchSyntaxMap.put(SearchLangageLDAPTokens.$USER_ACCOUNT_NAME,
"uid");
+ ipaSearchSyntaxMap.put(SearchLangageLDAPTokens.$SN, "SN");
+ ipaSearchSyntaxMap.put(SearchLangageLDAPTokens.$SAMACCOUNTNAME,
"SAMACCOUNTNAME");
+ ipaSearchSyntaxMap.put(SearchLangageLDAPTokens.$DEPARTMENT,
"DEPARTMENT");
+ ipaSearchSyntaxMap.put(SearchLangageLDAPTokens.$TITLE, "TITLE");
dsSearchSyntaxMap = new EnumMap<SearchLangageLDAPTokens,
String>(SearchLangageLDAPTokens.class);
dsSearchSyntaxMap.put(SearchLangageLDAPTokens.$GIVENNAME, "givenname");
@@ -597,6 +601,10 @@
dsSearchSyntaxMap.put(SearchLangageLDAPTokens.$LDAP_GROUP_CATEGORY,
"objectClass=groupOfUniqueNames");
dsSearchSyntaxMap.put(SearchLangageLDAPTokens.$CN, "cn");
dsSearchSyntaxMap.put(SearchLangageLDAPTokens.$USER_ACCOUNT_NAME,
"uid");
+ dsSearchSyntaxMap.put(SearchLangageLDAPTokens.$SN, "SN");
+ dsSearchSyntaxMap.put(SearchLangageLDAPTokens.$SAMACCOUNTNAME,
"SAMACCOUNTNAME");
+ dsSearchSyntaxMap.put(SearchLangageLDAPTokens.$DEPARTMENT,
"DEPARTMENT");
+ dsSearchSyntaxMap.put(SearchLangageLDAPTokens.$TITLE, "TITLE");
itdsSearchSyntaxMap = new EnumMap<SearchLangageLDAPTokens,
String>(SearchLangageLDAPTokens.class);
itdsSearchSyntaxMap.put(SearchLangageLDAPTokens.$GIVENNAME,
"givenname");
@@ -605,6 +613,10 @@
itdsSearchSyntaxMap.put(SearchLangageLDAPTokens.$LDAP_GROUP_CATEGORY,
"objectClass=groupOfUniqueNames");
itdsSearchSyntaxMap.put(SearchLangageLDAPTokens.$CN, "cn");
itdsSearchSyntaxMap.put(SearchLangageLDAPTokens.$USER_ACCOUNT_NAME,
"uid");
+ itdsSearchSyntaxMap.put(SearchLangageLDAPTokens.$SN, "SN");
+ itdsSearchSyntaxMap.put(SearchLangageLDAPTokens.$SAMACCOUNTNAME,
"SAMACCOUNTNAME");
+ itdsSearchSyntaxMap.put(SearchLangageLDAPTokens.$DEPARTMENT,
"DEPARTMENT");
+ itdsSearchSyntaxMap.put(SearchLangageLDAPTokens.$TITLE, "TITLE");
openLdapSearchSyntaxMap = new EnumMap<SearchLangageLDAPTokens,
String>(SearchLangageLDAPTokens.class);
openLdapSearchSyntaxMap.put(SearchLangageLDAPTokens.$GIVENNAME,
"givenname");
@@ -613,5 +625,9 @@
openLdapSearchSyntaxMap.put(SearchLangageLDAPTokens.$LDAP_GROUP_CATEGORY,
"objectClass=groupOfNames");
openLdapSearchSyntaxMap.put(SearchLangageLDAPTokens.$CN, "cn");
openLdapSearchSyntaxMap.put(SearchLangageLDAPTokens.$USER_ACCOUNT_NAME, "uid");
+ openLdapSearchSyntaxMap.put(SearchLangageLDAPTokens.$SN, "SN");
+ openLdapSearchSyntaxMap.put(SearchLangageLDAPTokens.$SAMACCOUNTNAME,
"SAMACCOUNTNAME");
+ openLdapSearchSyntaxMap.put(SearchLangageLDAPTokens.$DEPARTMENT,
"DEPARTMENT");
+ openLdapSearchSyntaxMap.put(SearchLangageLDAPTokens.$TITLE, "TITLE");
}
}
--
To view, visit http://gerrit.ovirt.org/18403
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I351a8c0e3341a6f975efec210398267aa828c3e0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Yair Zaslavsky <[email protected]>
Gerrit-Reviewer: Ravi Nori <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
