ITS#1716 is_entry_subentr/ies/y/

[openldap] / servers / slapd / at.c

diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index 3bffc75ac54ccda13769c71ab1c98806ce13b9e9..45ff44600e39154b9890cc3e5185eb493a632388 100644 (file)
--- a/servers/slapd/at.c
+++ b/servers/slapd/at.c
@@ -332,18 +332,15 @@ at_add(
        }
 
        if ( at->at_collective ) {
-#ifdef SLAP_COLLECTIVE
                if( at->at_usage ) {
                        /* collective attributes cannot be operational */
-                       return SLAP_SCHERR_NOT_SUPPORTED;
+                       return SLAP_SCHERR_ATTR_BAD_USAGE;
                }
+
                if( at->at_single_value ) {
                        /* collective attributes cannot be single-valued */
-                       return SLAP_SCHERR_NOT_SUPPORTED;
+                       return SLAP_SCHERR_ATTR_BAD_USAGE;
                }
-#else
-               return SLAP_SCHERR_NOT_SUPPORTED;
-#endif
        }
 
        sat = (AttributeType *) ch_calloc( 1, sizeof(AttributeType) );