(ITS#7760) query of a field with alias returns a different attribute name from requested

[mvohlken@us.ibm.com]

Full_Name: Max Vohlken
Version: 2.4.23
OS: Linux RHEL 6.4
URL: ftp://ftp.openldap.org/incoming/
Submission from: (NULL) (108.20.180.201)


Queries against the countryName attribute always return an attribute that has
the name 'c'. 'c' and 'countryName' are aliases for the same attribute. This
should be corrected so that the response uses the name that was requested
instead of the name that is listed first in the schema definition.

For example:
ldapsearch -x -b ou=people,dc=my-domain,dc=com -h server countryName
Returns:
# freds, people, my-domain.com
dn: uid=freds,ou=people,dc=my-domain,dc=com
c: United States

I tested this against a Tivoli LDAP server and it always responds with the name
of the attribute requested.

The schema entry looks like this:
{3}( 2.5.4.6 NAME ( 'c' 'countryName' ) DESC 'RFC4519: two-letter ISO-3166
country code' SUP name SINGLE-VALUE )

If I change it to swap the names like:
{3}( 2.5.4.6 NAME ( 'countryName' 'c' ) DESC 'RFC4519: two-letter ISO-3166
country code' SUP name SINGLE-VALUE )

Then countryName is returned as the name of the attribute instead.