move req2op selection into a helper

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 9be7f5399b90334ee92b748060d27f65ecbd1110..db2d83172a5fd0cd13139ebbbe738a501e784a04 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -35,7 +35,7 @@ static struct berval  builtin_supportedFeatures[] = {
        BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS),         /* (&) and (|) search filters */
        BER_BVC(LDAP_FEATURE_LANGUAGE_TAG_OPTIONS),     /* Language Tag Options */
        BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS),   /* Language Range Options */
-#ifdef LDAP_FEATURE_SUBORDINATE_SCOPE
+#ifdef LDAP_DEVEL
        BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE),        /* "children" search scope */
 #endif
        BER_BVNULL
@@ -213,10 +213,10 @@ root_dse_info(
        AttributeDescription *ad_ref
                = slap_schema.si_ad_ref;
 
-       e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
+       e = entry_alloc();
        if( e == NULL ) {
                Debug( LDAP_DEBUG_ANY,
-                       "root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );
+                       "root_dse_info: entry_alloc failed", 0, 0, 0 );
                return LDAP_OTHER;
        }
 
@@ -322,7 +322,7 @@ fail:
                 * clients.
                 */
        for ( i=LDAP_VERSION3; i<=LDAP_VERSION_MAX; i++ ) {
-               char buf[BUFSIZ];
+               char buf[sizeof("255")];
                snprintf(buf, sizeof buf, "%d", i);
                val.bv_val = buf;
                val.bv_len = strlen( val.bv_val );
@@ -395,10 +395,10 @@ int read_root_dse_file( const char *fname )
                return EXIT_FAILURE;
        }
 
-       usr_attr = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
+       usr_attr = entry_alloc();
        if( usr_attr == NULL ) {
                Debug( LDAP_DEBUG_ANY,
-                       "read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );
+                       "read_root_dse_file: entry_alloc failed", 0, 0, 0 );
                ldif_close( fp );
                return LDAP_OTHER;
        }