Teamcity LDAP Group Synchronization againt Oracle Internet Directoty (OID) ldap

Hi Team,

I am successfully able authenticcate and syncronize the user of teamcity with OID LDAP, However i am facing issue with the group synchronization getting below warning/Error

Error Log:
WARN -     jetbrains.buildServer.LDAP - Error during group synchronization: Remote entry retrieved as a member of a group does not match any known user or group. Entry: 'uid=user123,o=user,dc=test,dc=com'. Synchronized group: '[remoteId='Supervisor', groupKey='ADMIN', name='null', description='null', memberIds=3]'

This is becouse the user name "testuser" which is cn attribute, but when group filter return the uniqueue member it is in format "uid=user123,o=user,dc=test,dc=com" so its not match with existing user for mapping and autherization.

Could someone suggest how i can modify the LDAP configuration so i can successfully sunchronize the Groups and can assign the right roles to user which matches.

1. The Below are latest configuration i am using.
   
2. ldap-mapping.xml

<group-mapping teamcityGroupKey="ADMIN" ldapGroupDn="Supervisor"/>

<group-mapping teamcityGroupKey="DEVELOPER" ldapGroupDn="Read-Only"/>

1. Ldap_Config for the Group (ldap-config.properties)

java.naming.provider.url=<ldapURL>

java.naming.security.principal=<Adminuser>

java.naming.security.credentials=<pwd>

teamcity.users.login.filter=(cn=$capturedLogin$)

teamcity.auth.formatDN=uid=$capturedLogin$,o=user,dc=test,dc=com

teamcity.auth.loginFilter=.+
teamcity.users.property.displayName=givenName
teamcity.users.property.email=mail
teamcity.options.groups.synchronize=true

teamcity.groups.fetchOnlyMappedGroups=true

1. User and group synchronization

teamcity.users.base=o=user

teamcity.users.filter=(objectClass=user) 

teamcity.users.username=cn