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 939761e1415dff336a0328a667fcdeaf34be5e86..5db42c0f70c67647bb06734250e21c0709fa8e30 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -17,15 +17,14 @@
 
 #include "slap.h"
 #include <ldif.h>
-
-#define BVC(x) {sizeof(x)-1, x}
+#include "lber_pvt.h"
 
 static struct berval supportedFeatures[] = {
-       BVC("1.3.6.1.4.1.4203.1.5.1"), /* all Operational Attributes ("+") */
-       BVC("1.3.6.1.4.1.4203.1.5.2"), /* OCs in Attributes List */
-       BVC("1.3.6.1.4.1.4203.1.5.3"), /* (&) and (|) search filters */
-       BVC("1.3.6.1.4.1.4203.1.5.4"), /* Language Tag Options */
-       BVC("1.3.6.1.4.1.4203.1.5.5"), /* Language Range Options */
+       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}
 };
 
@@ -94,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 );
                }
        }