fix minor error message

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

diff --git a/servers/slapd/back-ldap/distproc.c b/servers/slapd/back-ldap/distproc.c
index 5710a2198bf4b4550724c5e5327a2ac6188c3e7f..95a167f6131f620ed5f19e6fc6121ec5a8f0e701 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-2006 The OpenLDAP Foundation.
+ * Copyright 2005-2007 The OpenLDAP Foundation.
  * Portions Copyright 2003 Howard Chu.
  * All rights reserved.
  *
@@ -22,14 +22,15 @@
 
 #include "portable.h"
 
-#ifdef LDAP_DEVEL
-
 #include <stdio.h>
 
 #include <ac/string.h>
 #include <ac/socket.h>
 
 #include "slap.h"
+
+#ifdef SLAP_DISTPROC
+
 #include "back-ldap.h"
 
 #include "config.h"
@@ -336,9 +337,10 @@ static ConfigTable distproc_cfg[] = {
                        "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
        { "distproc-cache-uri", "TRUE/FALSE",
                2, 2, 0, ARG_MAGIC|ARG_ON_OFF|DP_CACHE_URI, distproc_cfgen,
-               "( OLcfgOvAt:3.2 NAME 'olcCacheURI' "
+               "( OLcfgOvAt:3.2 NAME 'olcChainCacheURI' "
                        "DESC 'Enables caching of URIs not present in configuration' "
-                       "SYNTAX OMsBoolean SINGLE-VALUE )", NULL, NULL },
+                       "SYNTAX OMsBoolean "
+                       "SINGLE-VALUE )", NULL, NULL },
        { NULL, NULL, 0, 0, 0, ARG_IGNORED }
 };
 
@@ -349,7 +351,7 @@ static ConfigOCs distproc_ocs[] = {
                "SUP olcOverlayConfig "
                "MAY ( "
                        "olcChainingBehavior $ "
-                       "olcCacheURI "
+                       "olcChainCacheURI "
                        ") )",
                Cft_Overlay, distproc_cfg, NULL, distproc_cfadd },
        { "( OLcfgOvOc:7.2 "
@@ -829,7 +831,7 @@ ldap_distproc_db_init_one(
        BackendInfo     *bi = be->bd_info;
        ldapinfo_t      *li;
 
-       int             t;
+       slap_op_t       t;
 
        be->bd_info = lback;
        be->be_private = NULL;
@@ -843,7 +845,7 @@ ldap_distproc_db_init_one(
        li->li_nretries = lc->lc_common_li->li_nretries;
        li->li_flags = lc->lc_common_li->li_flags;
        li->li_version = lc->lc_common_li->li_version;
-       for ( t = 0; t < LDAP_BACK_OP_LAST; t++ ) {
+       for ( t = 0; t < SLAP_OP_LAST; t++ ) {
                li->li_timeout[ t ] = lc->lc_common_li->li_timeout[ t ];
        }
        be->bd_info = bi;
@@ -956,6 +958,7 @@ 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: "
@@ -963,6 +966,7 @@ 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,
@@ -1006,4 +1010,4 @@ distproc_initialize( void )
        return overlay_register( &distproc );
 }
 
-#endif /* LDAP_DEVEL */
+#endif /* SLAP_DISTPROC */