Import collective, obsolete and misc minor changes from HEAD

[openldap] / servers / slapd / at.c

diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index 5a618ae2969db99d2441b2866ef52de92988353b..63eda95ad2137590f397e81e165f22cfc67106d7 100644 (file)
--- a/servers/slapd/at.c
+++ b/servers/slapd/at.c
@@ -246,6 +246,11 @@ at_add(
                cname = "";
                return SLAP_SCHERR_ATTR_INCOMPLETE;
        }
+
+       if ( at->at_collective ) {
+               return SLAP_SCHERR_NOT_SUPPORTED;
+       }
+
        sat = (AttributeType *) ch_calloc( 1, sizeof(AttributeType) );
        AC_MEMCPY( &sat->sat_atype, at, sizeof(LDAPAttributeType));
 
@@ -323,7 +328,6 @@ at_add(
        }
 
        code = at_insert(sat,err);
-       return code;
 }
 
 #ifdef LDAP_DEBUG