Add 'referral'/'ref' to schema

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;
 			}
 		}

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

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,

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

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

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,