Add 'referral'/'ref' to schema

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 5b67b48ead31596b7d72373678b792a0c4209c52..ef7736399e3145895c75bdf45889645ca00f97a6 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -494,6 +494,7 @@ send_search_entry(
        int             i, rc=-1, bytes;
        struct acl      *acl;
        char            *edn;
+       int             allattrs;
 
        Debug( LDAP_DEBUG_TRACE, "=> send_search_entry (%s)\n", e->e_dn, 0, 0 );
 
@@ -538,20 +539,21 @@ send_search_entry(
                goto error_return;
        }
 
+       /* check for special all user attributes ("*") attribute */
+       allattrs = charray_inlist( attrs, LDAP_ALL_USER_ATTRIBUTES );
+
        for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
                regmatch_t       matches[MAXREMATCHES];
 
                if ( attrs == NULL ) {
                        /* all addrs request, skip operational attributes */
-                       if( !opattrs && oc_check_operational_attr( a->a_type )) {
+                       if( !opattrs && oc_check_operational_attr( a->a_type ) ) {
                                continue;
                        }
 
                } else {
                        /* specific addrs requested */
-                       if ( !charray_inlist( attrs, a->a_type )
-                               && !charray_inlist( attrs, LDAP_ALL_USER_ATTRIBUTES ) )
-                       {
+                       if ( !allattrs && !charray_inlist( attrs, a->a_type ) ) {
                                continue;
                        }
                }

diff --git a/servers/slapd/slapd.at.conf b/servers/slapd/slapd.at.conf
index c3c8b136b0d79050ed64f1740278ad4c0b716adc..01451706ffd02bdeed5f3f3ae1aca5eb5c31396e 100644 (file)
--- a/servers/slapd/slapd.at.conf
+++ b/servers/slapd/slapd.at.conf
@@ -3,6 +3,7 @@ attribute       personalsignature                       bin
 attribute      jpegphoto                               bin
 attribute      audio                                   bin
 attribute      labeledurl                              ces
+attribute      ref                                             ces
 attribute      userpassword                            ces
 attribute      telephonenumber                         tel
 attribute      facsimiletelephonenumber        fax     tel

diff --git a/servers/slapd/slapd.oc.conf b/servers/slapd/slapd.oc.conf
index 94f2349ba5f8ba1268c33299979d154f2431de4f..56d90c531d2b1c9ad9f9a59cafcaf53cb5296438 100644 (file)
--- a/servers/slapd/slapd.oc.conf
+++ b/servers/slapd/slapd.oc.conf
@@ -7,6 +7,21 @@ objectclass alias
                aliasedObjectName,
                objectClass
 
+objectclass referral
+       requires
+               ref,
+               objectClass
+
+objectclass dcobject
+       requires
+               objectClass,
+               dc
+
+objectclass uidobject
+       requires
+               objectClass,
+               uid
+
 objectclass country
        requires
                objectClass,

diff --git a/tests/data/referrals.ldif b/tests/data/referrals.ldif
index a6b603292e65a2f8ab9d78ba41577a42eb347e41..9e605ac244edcc42de481ff2ec2030bb75e7b2d3 100644 (file)
--- a/tests/data/referrals.ldif
+++ b/tests/data/referrals.ldif
@@ -4,17 +4,47 @@ objectclass: country
 
 dn: o=ABC, c=US
 o: ABC
-ref: ldap//hostA/      HostA
-ref: ldap//hostB/      HostB
+ref: ldap//hostA/o=abc,c=us    HostA
+ref: ldap//hostB/o=abc,c=us    HostB
 objectclass: referral
 objectclass: extensibleObject
 
 dn: o=XYZ, c=US
 o: XYZ
-ref: ldap//hostC/      HostC
+ref: ldap//hostC/o=xyz,c=us    HostC
 objectclass: referral
 objectclass: extensibleObject
 
+dn: o=Alias, c=US
+o: Alias
+aliasedObjectName: o=University of Michigan, c=US
+objectclass: alias
+objectclass: extensibleObject
+
 dn: o=University of Michigan, c=US
 o: University of Michigan
 objectclass: organization
+
+dn: cn=Manager, o=University of Michigan, c=US
+cn: Manager
+cn: Directory Manager
+cn: Dir Man
+sn: Manager
+description: Manager of the directory
+userpassword: secret
+objectclass: person
+
+dn: cn=Alias, o=University of Michigan, c=US
+cn: Alias
+aliasedobjectname: cn=Manager, o=University of Michigan, c=US
+objectclass: extensibleObject
+
+dn: cn=Circular, o=University of Michigan, c=US
+cn: Circular
+aliasedobjectname: cn=Circular, o=University of Michigan, c=US
+objectclass: extensibleObject
+
+dn: cn=Subordinate, o=University of Michigan, c=US
+cn: Subordinate
+aliasedobjectname: cn=Subordinate, cn=Alias, o=University of Michigan, c=US
+objectclass: extensibleObject

diff --git a/tests/data/slapd.at.conf b/tests/data/slapd.at.conf
index c3c8b136b0d79050ed64f1740278ad4c0b716adc..01451706ffd02bdeed5f3f3ae1aca5eb5c31396e 100644 (file)
--- a/tests/data/slapd.at.conf
+++ b/tests/data/slapd.at.conf
@@ -3,6 +3,7 @@ attribute       personalsignature                       bin
 attribute      jpegphoto                               bin
 attribute      audio                                   bin
 attribute      labeledurl                              ces
+attribute      ref                                             ces
 attribute      userpassword                            ces
 attribute      telephonenumber                         tel
 attribute      facsimiletelephonenumber        fax     tel

diff --git a/tests/data/slapd.oc.conf b/tests/data/slapd.oc.conf
index 94f2349ba5f8ba1268c33299979d154f2431de4f..5ff324314361ba30d4774a69e1b235373fe426b2 100644 (file)
--- a/tests/data/slapd.oc.conf
+++ b/tests/data/slapd.oc.conf
@@ -7,6 +7,11 @@ objectclass alias
                aliasedObjectName,
                objectClass
 
+objectclass referral
+       requires
+               ref
+               objectClass
+
 objectclass country
        requires
                objectClass,
@@ -83,18 +88,17 @@ objectclass organizationalUnit
 objectclass person
        requires
                objectClass,
-               sn,
                cn
        allows
                description,
                seeAlso,
+               sn,
                telephoneNumber,
                userPassword
 
 objectclass organizationalPerson
        requires
                objectClass,
-               sn,
                cn
        allows
                description,
@@ -110,6 +114,7 @@ objectclass organizationalPerson
                preferredDeliveryMethod,
                registeredAddress,
                seeAlso,
+               sn,
                st,
                streetAddress,
                telephoneNumber,
@@ -161,7 +166,6 @@ objectclass groupOfNames
 objectclass residentialPerson
        requires
                objectClass,
-               sn,
                cn,
                l
        allows
@@ -178,6 +182,7 @@ objectclass residentialPerson
                preferredDeliveryMethod,
                registeredAddress,
                seeAlso,
+               sn,
                st,
                streetAddress,
                telephoneNumber,
@@ -261,7 +266,6 @@ objectclass pilotObject
 objectclass newPilotPerson
        requires
                objectClass,
-               sn,
                cn
        allows
                businessCategory,
@@ -270,6 +274,8 @@ objectclass newPilotPerson
                homePhone,
                homePostalAddress,
                janetMailbox,
+               lastModifiedBy,
+               lastModifiedTime,
                mail,
                mailPreferenceOption,
                mobile,
@@ -282,6 +288,7 @@ objectclass newPilotPerson
                roomNumber,
                secretary,
                seeAlso,
+               sn,
                telephoneNumber,
                textEncodedORaddress,
                uid,
@@ -663,9 +670,7 @@ objectclass kerberosSecurityObject
 objectclass umichPerson
        requires
                objectClass,
-               sn,
-               cn,
-               universityID
+               cn
        allows
                affiliationCode,
                audio,
@@ -714,6 +719,7 @@ objectclass umichPerson
                roomNumber,
                secretary,
                seeAlso,
+               sn,
                st,
                streetAddress,
                telephoneNumber,
@@ -722,6 +728,7 @@ objectclass umichPerson
                textEncodedORaddress,
                title,
                uid,
+               universityID,
                updateSource,
                userCertificate,
                userClass,