ITS#8578 - remove unused-variables in RE24 testing call (2.4.45)

[openldap] / servers / slapd / back-ldap / distproc.c

diff --git a/servers/slapd/back-ldap/distproc.c b/servers/slapd/back-ldap/distproc.c
index 0b49767b0b9b0c1d848224435e50c1c79deb97b0..c5946ce521cb3d40c0378d32a4e27009ee633134 100644 (file)
--- a/servers/slapd/back-ldap/distproc.c
+++ b/servers/slapd/back-ldap/distproc.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2005-2013 The OpenLDAP Foundation.
+ * Copyright 2005-2017 The OpenLDAP Foundation.
  * Portions Copyright 2003 Howard Chu.
  * All rights reserved.
  *
@@ -211,7 +211,10 @@ static int         sc_returnContRef;
 #define get_returnContRef(op)          ((op)->o_returnContRef & SLAP_CONTROL_MASK)
 
 static struct berval   slap_EXOP_CHAINEDREQUEST = BER_BVC( LDAP_EXOP_X_CHAINEDREQUEST );
+#ifdef LDAP_DEVEL
 static struct berval   slap_FEATURE_CANCHAINOPS = BER_BVC( LDAP_FEATURE_X_CANCHAINOPS );
+#endif
+
 
 static BackendInfo     *lback;
 
@@ -423,7 +426,8 @@ distproc_ldadd( CfEntryInfo *p, Entry *e, ConfigArgs *ca )
                Debug( LDAP_DEBUG_ANY, "slapd-distproc: "
                        "unable to init %sunderlying database \"%s\".\n",
                        lc->lc_common_li == NULL ? "common " : "", e->e_name.bv_val, 0 );
-               return LDAP_CONSTRAINT_VIOLATION;
+               rc = LDAP_CONSTRAINT_VIOLATION;
+               goto done;
        }
 
        li = ca->be->be_private;
@@ -958,7 +962,6 @@ distproc_initialize( void )
                return rc;
        }
 
-#ifdef LDAP_DEVEL
        rc = supported_feature_load( &slap_FEATURE_CANCHAINOPS );
        if ( rc != LDAP_SUCCESS ) {
                Debug( LDAP_DEBUG_ANY, "slapd-distproc: "
@@ -966,7 +969,6 @@ distproc_initialize( void )
                        rc, 0, 0 );
                return rc;
        }
-#endif
 
        rc = register_supported_control( LDAP_CONTROL_X_RETURNCONTREF,
                        SLAP_CTRL_GLOBAL|SLAP_CTRL_ACCESS|SLAP_CTRL_HIDE, NULL,