remove dbenv->lock_put() call from transaction-protected operations

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 066827dec55e6bac4da0ea29962072e68ef41308..5db42c0f70c67647bb06734250e21c0709fa8e30 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -17,14 +17,15 @@
 
 #include "slap.h"
 #include <ldif.h>
-
-static char *supportedFeatures[] = {
-       "1.3.6.1.4.1.4203.1.5.1", /* all Operational Attributes ("+") */
-       "1.3.6.1.4.1.4203.1.5.2", /* OCs in Attributes List */
-       "1.3.6.1.4.1.4203.1.5.3", /* (&) and (|) search filters */
-       "1.3.6.1.4.1.4203.1.5.4", /* Language Tag Options */
-       "1.3.6.1.4.1.4203.1.5.5", /* Language Range Options */
-       NULL
+#include "lber_pvt.h"
+
+static struct berval supportedFeatures[] = {
+       BER_BVC("1.3.6.1.4.1.4203.1.5.1"), /* all Operational Attributes ("+") */
+       BER_BVC("1.3.6.1.4.1.4203.1.5.2"), /* OCs in Attributes List */
+       BER_BVC("1.3.6.1.4.1.4203.1.5.3"), /* (&) and (|) search filters */
+       BER_BVC("1.3.6.1.4.1.4203.1.5.4"), /* Language Tag Options */
+       BER_BVC("1.3.6.1.4.1.4203.1.5.5"), /* Language Range Options */
+       {0,NULL}
 };
 
 static Entry   *usr_attr = NULL;
@@ -92,8 +93,8 @@ root_dse_info(
                if ( backends[i].be_flags & SLAP_BFLAG_GLUE_SUBORDINATE ) {
                        continue;
                }
-               for ( j = 0; backends[i].be_suffix[j] != NULL; j++ ) {
-                       vals[0] = *backends[i].be_suffix[j];
+               for ( j = 0; backends[i].be_suffix[j].bv_val != NULL; j++ ) {
+                       vals[0] = backends[i].be_suffix[j];
                        attr_merge( e, ad_namingContexts, vals );
                }
        }
@@ -113,11 +114,7 @@ root_dse_info(
        }
 
        /* supportedFeatures */
-       for ( i=0; supportedFeatures[i] != NULL; i++ ) {
-               vals[0].bv_val = supportedFeatures[i];
-               vals[0].bv_len = strlen( vals[0].bv_val );
-               attr_merge( e, ad_supportedFeatures, vals );
-       }
+       attr_merge( e, ad_supportedFeatures, supportedFeatures );
 
        /* supportedLDAPVersion */
        for ( i=LDAP_VERSION_MIN; i<=LDAP_VERSION_MAX; i++ ) {