]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-ldap/chain.c
fix -ULDAP_DEVEL compile
[openldap] / servers / slapd / back-ldap / chain.c
index d02e039c4f3c8a58a66ce74bcc8584bbbde2a959..05593fa5cbc4524a536aca6d1a8ea0347e96cc59 100644 (file)
 #include "slap.h"
 #include "back-ldap.h"
 
+#include "config.h"
+
 #ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+#define SLAP_CHAINING_DEFAULT                          LDAP_CHAINING_PREFERRED
 #define SLAP_CH_RESOLVE_SHIFT                          SLAP_CONTROL_SHIFT
 #define SLAP_CH_RESOLVE_MASK                           (0x3 << SLAP_CH_RESOLVE_SHIFT)
 #define SLAP_CH_RESOLVE_CHAINING_PREFERRED             (LDAP_CHAINING_PREFERRED << SLAP_CH_RESOLVE_SHIFT)
 #define SLAP_CH_RESOLVE_CHAINING_REQUIRED              (LDAP_CHAINING_REQUIRED << SLAP_CH_RESOLVE_SHIFT)
 #define SLAP_CH_RESOLVE_REFERRALS_PREFERRED            (LDAP_REFERRALS_PREFERRED << SLAP_CH_RESOLVE_SHIFT)
 #define SLAP_CH_RESOLVE_REFERRALS_REQUIRED             (LDAP_REFERRALS_REQUIRED << SLAP_CH_RESOLVE_SHIFT)
-#define SLAP_CH_RESOLVE_DEFAULT                                SLAP_CH_RESOLVE_CHAINING_PREFERRED
+#define SLAP_CH_RESOLVE_DEFAULT                                (SLAP_CHAINING_DEFAULT << SLAP_CH_RESOLVE_SHIFT)
 #define        SLAP_CH_CONTINUATION_SHIFT                      (SLAP_CH_RESOLVE_SHIFT + 2)
 #define SLAP_CH_CONTINUATION_MASK                      (0x3 << SLAP_CH_CONTINUATION_SHIFT)
 #define SLAP_CH_CONTINUATION_CHAINING_PREFERRED                (LDAP_CHAINING_PREFERRED << SLAP_CH_CONTINUATION_SHIFT)
 #define SLAP_CH_CONTINUATION_CHAINING_REQUIRED         (LDAP_CHAINING_REQUIRED << SLAP_CH_CONTINUATION_SHIFT)
 #define SLAP_CH_CONTINUATION_REFERRALS_PREFERRED       (LDAP_REFERRALS_PREFERRED << SLAP_CH_CONTINUATION_SHIFT)
 #define SLAP_CH_CONTINUATION_REFERRALS_REQUIRED                (LDAP_REFERRALS_REQUIRED << SLAP_CH_CONTINUATION_SHIFT)
-#define SLAP_CH_CONTINUATION_DEFAULT                   SLAP_CH_CONTINUATION_CHAINING_PREFERRED
+#define SLAP_CH_CONTINUATION_DEFAULT                   (SLAP_CHAINING_DEFAULT << SLAP_CH_CONTINUATION_SHIFT)
 
 #define o_chaining                     o_ctrlflag[sc_chainingBehavior]
 #define get_chaining(op)               ((op)->o_chaining & SLAP_CONTROL_MASK)
 #define get_chainingBehavior(op)       ((op)->o_chaining & (SLAP_CH_RESOLVE_MASK|SLAP_CH_CONTINUATION_MASK))
 #define get_resolveBehavior(op)                ((op)->o_chaining & SLAP_CH_RESOLVE_MASK)
 #define get_continuationBehavior(op)   ((op)->o_chaining & SLAP_CH_CONTINUATION_MASK)
+
+static int             sc_chainingBehavior;
 #endif /*  LDAP_CONTROL_X_CHAINING_BEHAVIOR */
 
 #define        LDAP_CH_NONE                    ((void *)(0))
 #define        LDAP_CH_RES                     ((void *)(1))
 #define LDAP_CH_ERR                    ((void *)(2))
 
-static int             sc_chainingBehavior;
 static BackendInfo     *lback;
 
 typedef struct ldap_chain_t {
@@ -64,10 +68,85 @@ typedef struct ldap_chain_t {
        unsigned                lc_flags;
 #define LDAP_CHAIN_F_NONE              0x00U
 #define        LDAP_CHAIN_F_CHAINING           0x01U
-       LDAPControl             lc_chaining_ctrl;
 
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+       LDAPControl             lc_chaining_ctrl;
+       char                    lc_chaining_ctrlflag;
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
 } ldap_chain_t;
 
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+static int
+chaining_control_add(
+               ldap_chain_t    *lc,
+               Operation       *op, 
+               LDAPControl     ***oldctrlsp )
+{
+       LDAPControl     **ctrls = NULL;
+       int             c = 0;
+
+       *oldctrlsp = op->o_ctrls;
+
+       /* default chaining control not defined */
+       if ( !( lc->lc_flags & LDAP_CHAIN_F_CHAINING ) ) {
+               return 0;
+       }
+
+       /* already present */
+       if ( get_chaining( op ) > SLAP_CONTROL_IGNORED ) {
+               return 0;
+       }
+
+       /* FIXME: check other incompatibilities */
+
+       /* add to other controls */
+       if ( op->o_ctrls ) {
+               for ( c = 0; op->o_ctrls[ c ]; c++ )
+                       /* count them */ ;
+       }
+
+       ctrls = ch_calloc( sizeof( LDAPControl *), c + 2 );
+       ctrls[ 0 ] = &lc->lc_chaining_ctrl;
+       if ( op->o_ctrls ) {
+               for ( c = 0; op->o_ctrls[ c ]; c++ ) {
+                       ctrls[ c + 1 ] = op->o_ctrls[ c ];
+               }
+       }
+       ctrls[ c + 1 ] = NULL;
+
+       op->o_ctrls = ctrls;
+
+       op->o_chaining = lc->lc_chaining_ctrlflag;
+
+       return 0;
+}
+
+static int
+chaining_control_remove(
+               Operation       *op, 
+               LDAPControl     ***oldctrlsp )
+{
+       LDAPControl     **oldctrls = *oldctrlsp;
+
+       /* we assume that the first control is the chaining control
+        * added by the chain overlay, so it's the only one we explicitly 
+        * free */
+       if ( op->o_ctrls != oldctrls ) {
+               assert( op->o_ctrls );
+               assert( op->o_ctrls[ 0 ] );
+
+               free( op->o_ctrls );
+
+               op->o_chaining = 0;
+               op->o_ctrls = oldctrls;
+       } 
+
+       *oldctrlsp = NULL;
+
+       return 0;
+}
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
+
 static int
 ldap_chain_operational( Operation *op, SlapReply *rs )
 {
@@ -185,9 +264,16 @@ ldap_chain_op(
        /* NOTE: returned if ref is empty... */
        int             rc = LDAP_OTHER;
 
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+       LDAPControl     **ctrls = NULL;
+       
+       (void)chaining_control_add( lc, op, &ctrls );
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
+
        if ( lip->url != NULL ) {
                op->o_bd->be_private = lip;
-               return ( *op_f )( op, rs );
+               rc = ( *op_f )( op, rs );
+               goto done;
        }
 
        li = *lip;
@@ -255,13 +341,18 @@ Document: draft-ietf-ldapbis-protocol-27.txt
                }
        }
 
+done:;
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+       (void)chaining_control_remove( op, &ctrls );
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
+
        return rc;
 }
 
 static int
 ldap_chain_response( Operation *op, SlapReply *rs )
 {
-       slap_overinst   *on = (slap_overinst *) op->o_bd->bd_info;
+       slap_overinst   *on = (slap_overinst *)op->o_bd->bd_info;
        void            *private = op->o_bd->be_private;
        slap_callback   *sc = op->o_callback,
                        sc2 = { 0 };
@@ -405,6 +496,12 @@ ldap_chain_response( Operation *op, SlapReply *rs )
                                        odn = op->o_req_dn,
                                        ondn = op->o_req_ndn;
 
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+                       LDAPControl     **ctrls = NULL;
+       
+                       (void)chaining_control_add( lc, op, &ctrls );
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
+
                        rs->sr_type = REP_SEARCH;
 
                        sc2.sc_response = ldap_chain_cb_search_response;
@@ -477,6 +574,10 @@ ldap_chain_response( Operation *op, SlapReply *rs )
                                rc = rs->sr_err;
                        }
 
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+                       (void)chaining_control_remove( op, &ctrls );
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
+
                        op->o_req_dn = odn;
                        op->o_req_ndn = ondn;
                        rs->sr_type = REP_SEARCHREF;
@@ -547,6 +648,13 @@ dont_chain:;
        return rc;
 }
 
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+static int
+ldap_chain_parse_ctrl(
+       Operation       *op,
+       SlapReply       *rs,
+       LDAPControl     *ctrl );
+
 static int
 str2chain( const char *s )
 {
@@ -565,6 +673,265 @@ str2chain( const char *s )
 
        return -1;
 }
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
+
+enum {
+       PC_CHAINING = 1
+};
+
+static ConfigDriver chain_cf_gen;
+static ConfigLDAPadd chain_ldadd;
+static ConfigCfAdd chain_cfadd;
+
+static ConfigTable chaincfg[] = {
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+       { "chain-chaining", "args",
+               2, 4, 0, ARG_MAGIC|ARG_BERVAL|PC_CHAINING, chain_cf_gen,
+               "( OLcfgOvAt:3.1 NAME 'olcChainingBehavior' "
+                       "DESC 'Chaining behavior control parameters (draft-sermersheim-ldap-chaining)' "
+                       "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
+       { NULL, NULL, 0, 0, 0, ARG_IGNORED }
+};
+
+static ConfigOCs chainocs[] = {
+       { "( OLcfgOvOc:3.1 "
+               "NAME 'olcChainConfig' "
+               "DESC 'Chain configuration' "
+               "SUP olcOverlayConfig "
+               "MAY olcChainingBehavior )", Cft_Overlay, chaincfg, NULL, chain_cfadd },
+       { "( OLcfgOvOc:3.2 "
+               "NAME 'olcChainDatabase' "
+               "DESC 'Chain remote server configuration' "
+               "AUXILIARY )", Cft_Misc, chaincfg, chain_ldadd },
+       { NULL, 0, NULL }
+};
+
+static int
+chain_ldadd( CfEntryInfo *p, Entry *e, ConfigArgs *ca )
+{
+       if ( p->ce_type != Cft_Overlay || !p->ce_bi ||
+               p->ce_bi->bi_cf_ocs != chainocs )
+               return LDAP_CONSTRAINT_VIOLATION;
+
+       return LDAP_SUCCESS;
+}
+
+static int
+chain_cfadd( Operation *op, SlapReply *rs, Entry *p, ConfigArgs *ca )
+{
+       CfEntryInfo     *pe = p->e_private;
+       slap_overinst   *on = (slap_overinst *)pe->ce_bi;
+       ldap_chain_t    *lc = (ldap_chain_t *)on->on_bi.bi_private;
+       void            *priv = (void *)ca->be->be_private;
+       struct berval   bv;
+
+       /* FIXME: should not hardcode "olcDatabase" here */
+       bv.bv_len = sprintf( ca->msg, "olcDatabase=%s", lback->bi_type );
+       bv.bv_val = ca->msg;
+
+       /* We can only create this entry if the database is table-driven */
+       if ( lback->bi_cf_ocs ) {
+               ca->be->be_private = (void *)lc->lc_li;
+               config_build_entry( op, rs, pe, ca, &bv, lback->bi_cf_ocs, &chainocs[1] );
+               ca->be->be_private = priv;
+       }
+
+       return 0;
+}
+
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+static slap_verbmasks chaining_mode[] = {
+       { BER_BVC("referralsRequired"),         LDAP_REFERRALS_REQUIRED },
+       { BER_BVC("referralsPreferred"),        LDAP_REFERRALS_PREFERRED },
+       { BER_BVC("chainingRequired"),          LDAP_CHAINING_REQUIRED },
+       { BER_BVC("chainingPreferred"),         LDAP_CHAINING_PREFERRED },
+       { BER_BVNULL,                           0 }
+};
+#endif
+
+static int
+chain_cf_gen( ConfigArgs *c )
+{
+       slap_overinst   *on = (slap_overinst *)c->bi;
+       ldap_chain_t    *lc = (ldap_chain_t *)on->on_bi.bi_private;
+
+       int             rc = 0;
+
+       if ( c->op == SLAP_CONFIG_EMIT ) {
+               switch( c->type ) {
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+               case PC_CHAINING: {
+                       struct berval   resolve = BER_BVNULL,
+                                       continuation = BER_BVNULL;
+
+                       if ( !( lc->lc_flags & LDAP_CHAIN_F_CHAINING ) ) {
+                               return 1;
+                       }
+
+                       enum_to_verb( chaining_mode, ( ( lc->lc_chaining_ctrlflag & SLAP_CH_RESOLVE_MASK ) >> SLAP_CH_RESOLVE_SHIFT ), &resolve );
+                       enum_to_verb( chaining_mode, ( ( lc->lc_chaining_ctrlflag & SLAP_CH_CONTINUATION_MASK ) >> SLAP_CH_CONTINUATION_SHIFT ), &continuation );
+
+                       c->value_bv.bv_len = STRLENOF( "resolve=" ) + resolve.bv_len
+                               + STRLENOF( " " )
+                               + STRLENOF( "continuation=" ) + continuation.bv_len;
+                       c->value_bv.bv_val = ch_malloc( c->value_bv.bv_len + 1 );
+                       snprintf( c->value_bv.bv_val, c->value_bv.bv_len + 1,
+                               "resolve=%s continuation=%s",
+                               resolve.bv_val, continuation.bv_val );
+
+                       if ( lc->lc_chaining_ctrl.ldctl_iscritical ) {
+                               c->value_bv.bv_val = ch_realloc( c->value_bv.bv_val,
+                                       c->value_bv.bv_len + STRLENOF( " critical" ) + 1 );
+                               AC_MEMCPY( &c->value_bv.bv_val[ c->value_bv.bv_len ],
+                                       " critical", STRLENOF( " critical" ) + 1 );
+                               c->value_bv.bv_len += STRLENOF( " critical" );
+                       }
+
+                       break;
+               }
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
+
+               default:
+                       assert( 0 );
+                       rc = 1;
+               }
+               return rc;
+
+       } else if ( c->op == LDAP_MOD_DELETE ) {
+               return 1;       /* FIXME */
+#if 0
+               switch( c->type ) {
+               case PC_ATTR:
+               case PC_TEMP:
+               }
+               return rc;
+#endif
+       }
+
+       switch( c->type ) {
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+       case PC_CHAINING: {
+               char                    **argv = c->argv;
+               int                     argc = c->argc;
+               BerElementBuffer        berbuf;
+               BerElement              *ber = (BerElement *)&berbuf;
+               int                     resolve = -1,
+                                       continuation = -1,
+                                       iscritical = 0;
+               Operation               op = { 0 };
+               SlapReply               rs = { 0 };
+
+               lc->lc_chaining_ctrlflag = 0;
+
+               for ( argc--, argv++; argc > 0; argc--, argv++ ) {
+                       if ( strncasecmp( argv[ 0 ], "resolve=", STRLENOF( "resolve=" ) ) == 0 ) {
+                               resolve = str2chain( argv[ 0 ] + STRLENOF( "resolve=" ) );
+                               if ( resolve == -1 ) {
+                                       fprintf( stderr, "%s line %d: "
+                                               "illegal <resolve> value %s "
+                                               "in \"chain-chaining>\"\n",
+                                               c->fname, c->lineno, argv[ 0 ] );
+                                       return 1;
+                               }
+
+                       } else if ( strncasecmp( argv[ 0 ], "continuation=", STRLENOF( "continuation=" ) ) == 0 ) {
+                               continuation = str2chain( argv[ 0 ] + STRLENOF( "continuation=" ) );
+                               if ( continuation == -1 ) {
+                                       fprintf( stderr, "%s line %d: "
+                                               "illegal <continuation> value %s "
+                                               "in \"chain-chaining\"\n",
+                                               c->fname, c->lineno, argv[ 0 ] );
+                                       return 1;
+                               }
+
+                       } else if ( strcasecmp( argv[ 0 ], "critical" ) == 0 ) {
+                               iscritical = 1;
+
+                       } else {
+                               fprintf( stderr, "%s line %d: "
+                                       "unknown option in \"chain-chaining\"\n",
+                                       c->fname, c->lineno );
+                               return 1;
+                       }
+               }
+
+               if ( resolve != -1 || continuation != -1 ) {
+                       int     err;
+
+                       if ( resolve == -1 ) {
+                               /* default */
+                               resolve = SLAP_CHAINING_DEFAULT;
+                       }
+
+                       ber_init2( ber, NULL, LBER_USE_DER );
+
+                       err = ber_printf( ber, "{e" /* } */, resolve );
+                       if ( err == -1 ) {
+                               ber_free( ber, 1 );
+                               fprintf( stderr, "%s line %d: "
+                                       "chaining behavior control encoding error!\n",
+                                       c->fname, c->lineno );
+                               return 1;
+                       }
+
+                       if ( continuation > -1 ) {
+                               err = ber_printf( ber, "e", continuation );
+                               if ( err == -1 ) {
+                                       ber_free( ber, 1 );
+                                       fprintf( stderr, "%s line %d: "
+                                               "chaining behavior control encoding error!\n",
+                                               c->fname, c->lineno );
+                                       return 1;
+                               }
+                       }
+
+                       err = ber_printf( ber, /* { */ "N}" );
+                       if ( err == -1 ) {
+                               ber_free( ber, 1 );
+                               fprintf( stderr, "%s line %d: "
+                                       "chaining behavior control encoding error!\n",
+                                       c->fname, c->lineno );
+                               return 1;
+                       }
+
+                       if ( ber_flatten2( ber, &lc->lc_chaining_ctrl.ldctl_value, 0 ) == -1 ) {
+                               exit( EXIT_FAILURE );
+                       }
+
+               } else {
+                       BER_BVZERO( &lc->lc_chaining_ctrl.ldctl_value );
+               }
+
+               lc->lc_chaining_ctrl.ldctl_oid = LDAP_CONTROL_X_CHAINING_BEHAVIOR;
+               lc->lc_chaining_ctrl.ldctl_iscritical = iscritical;
+
+               if ( ldap_chain_parse_ctrl( &op, &rs, &lc->lc_chaining_ctrl ) != LDAP_SUCCESS )
+               {
+                       fprintf( stderr, "%s line %d: "
+                               "unable to parse chaining control%s%s\n",
+                               c->fname, c->lineno,
+                               rs.sr_text ? ": " : "",
+                               rs.sr_text ? rs.sr_text : "" );
+                       return 1;
+               }
+
+               lc->lc_chaining_ctrlflag = op.o_chaining;
+
+               lc->lc_flags |= LDAP_CHAIN_F_CHAINING;
+
+               rc = 0;
+
+               break;
+       }
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
+
+       default:
+               assert( 0 );
+               return 1;
+       }
+       return rc;
+}
 
 static int
 ldap_chain_db_config(
@@ -572,49 +939,53 @@ ldap_chain_db_config(
        const char      *fname,
        int             lineno,
        int             argc,
-       char    **argv
-)
+       char            **argv )
 {
        slap_overinst   *on = (slap_overinst *) be->bd_info;
        ldap_chain_t    *lc = (ldap_chain_t *)on->on_bi.bi_private;
-       void            *private = be->be_private;
        char            *argv0 = NULL;
        int             rc;
+       BackendDB       db = *be;
 
-       be->be_private = lc->lc_li;
        if ( strncasecmp( argv[ 0 ], "chain-", STRLENOF( "chain-" ) ) == 0 ) {
                argv0 = argv[ 0 ];
                argv[ 0 ] = &argv[ 0 ][ STRLENOF( "chain-" ) ];
 
-               if ( strcasecmp( argv0, "chaining" ) == 0 ) {
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+               if ( strcasecmp( argv[ 0 ], "chaining" ) == 0 ) {
+                       char                    **tmpargv = argv;
                        BerElementBuffer        berbuf;
                        BerElement              *ber = (BerElement *)&berbuf;
                        int                     resolve = -1,
                                                continuation = -1,
                                                iscritical = 0;
+                       Operation               op = { 0 };
+                       SlapReply               rs = { 0 };
 
-                       for ( argc--, argv++; argc > 0; argc--, argv++ ) {
-                               if ( strncasecmp( argv[0], "resolve=", STRLENOF( "resolve=" ) ) == 0 ) {
-                                       resolve = str2chain( argv[ 0 ] + STRLENOF( "resolve=" ) );
+                       lc->lc_chaining_ctrlflag = 0;
+
+                       for ( argc--, tmpargv++; argc > 0; argc--, tmpargv++ ) {
+                               if ( strncasecmp( tmpargv[ 0 ], "resolve=", STRLENOF( "resolve=" ) ) == 0 ) {
+                                       resolve = str2chain( tmpargv[ 0 ] + STRLENOF( "resolve=" ) );
                                        if ( resolve == -1 ) {
                                                fprintf( stderr, "%s line %d: "
                                                        "illegal <resolve> value %s "
                                                        "in \"chain-chaining>\"\n",
-                                                       fname, lineno, argv[ 0 ] );
+                                                       fname, lineno, tmpargv[ 0 ] );
                                                return 1;
                                        }
 
-                               } else if ( strncasecmp( argv[0], "continuation=", STRLENOF( "continuation=" ) ) == 0 ) {
-                                       continuation = str2chain( argv[ 0 ] + STRLENOF( "continuation=" ) );
+                               } else if ( strncasecmp( tmpargv[ 0 ], "continuation=", STRLENOF( "continuation=" ) ) == 0 ) {
+                                       continuation = str2chain( tmpargv[ 0 ] + STRLENOF( "continuation=" ) );
                                        if ( continuation == -1 ) {
                                                fprintf( stderr, "%s line %d: "
                                                        "illegal <continuation> value %s "
                                                        "in \"chain-chaining\"\n",
-                                                       fname, lineno, argv[ 0 ] );
+                                                       fname, lineno, tmpargv[ 0 ] );
                                                return 1;
                                        }
 
-                               } else if ( strcasecmp( argv[ 0 ], "critical" ) == 0 ) {
+                               } else if ( strcasecmp( tmpargv[ 0 ], "critical" ) == 0 ) {
                                        iscritical = 1;
 
                                } else {
@@ -630,7 +1001,7 @@ ldap_chain_db_config(
 
                                if ( resolve == -1 ) {
                                        /* default */
-                                       resolve = LDAP_CHAINING_PREFERRED;
+                                       resolve = SLAP_CHAINING_DEFAULT;
                                }
 
                                ber_init2( ber, NULL, LBER_USE_DER );
@@ -675,16 +1046,31 @@ ldap_chain_db_config(
                        lc->lc_chaining_ctrl.ldctl_oid = LDAP_CONTROL_X_CHAINING_BEHAVIOR;
                        lc->lc_chaining_ctrl.ldctl_iscritical = iscritical;
 
+                       if ( ldap_chain_parse_ctrl( &op, &rs, &lc->lc_chaining_ctrl ) != LDAP_SUCCESS )
+                       {
+                               fprintf( stderr, "%s line %d: "
+                                       "unable to parse chaining control%s%s\n",
+                                       fname, lineno,
+                                       rs.sr_text ? ": " : "",
+                                       rs.sr_text ? rs.sr_text : "" );
+                               return 1;
+                       }
+
+                       lc->lc_chaining_ctrlflag = op.o_chaining;
+
                        lc->lc_flags |= LDAP_CHAIN_F_CHAINING;
 
-                       return 0;
+                       rc = 0;
+                       goto done;
                }
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
        }
 
+       db.be_cf_ocs = lback->bi_cf_ocs;
+       db.be_private = lc->lc_li;
+       rc = lback->bi_db_config( &db, fname, lineno, argc, argv );
 
-       rc = lback->bi_db_config( be, fname, lineno, argc, argv );
-       be->be_private = private;
-
+done:;
        if ( argv0 ) {
                argv[ 0 ] = argv0;
        }
@@ -694,8 +1080,7 @@ ldap_chain_db_config(
 
 static int
 ldap_chain_db_init(
-       BackendDB *be
-)
+       BackendDB *be )
 {
        slap_overinst   *on = (slap_overinst *)be->bd_info;
        ldap_chain_t    *lc = NULL;
@@ -905,9 +1290,9 @@ static slap_overinst ldapchain;
 int
 chain_init( void )
 {
-#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
        int     rc;
 
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
        rc = register_supported_control( LDAP_CONTROL_X_CHAINING_BEHAVIOR,
                        /* SLAP_CTRL_GLOBAL| */ SLAP_CTRL_ACCESS|SLAP_CTRL_HIDE, NULL,
                        ldap_chain_parse_ctrl, &sc_chainingBehavior );
@@ -938,6 +1323,13 @@ chain_init( void )
 
        ldapchain.on_response = ldap_chain_response;
 
+       ldapchain.on_bi.bi_cf_ocs = chainocs;
+
+       rc = config_register_schema( chaincfg, chainocs );
+       if ( rc ) {
+               return rc;
+       }
+
        return overlay_register( &ldapchain );
 }