]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-ldap/chain.c
fix entry DN free
[openldap] / servers / slapd / back-ldap / chain.c
index 67927c40d767c0c98eb6d788c79ee3af13abe3bf..573ab84ebeb0be6a9caef20376c4acdb4e85d217 100644 (file)
 #include "slap.h"
 #include "back-ldap.h"
 
-static BackendInfo *lback;
+#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_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_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 BackendInfo     *lback;
+
+typedef struct ldap_chain_t {
+       struct ldapinfo         *lc_li;
+       unsigned                lc_flags;
+#define LDAP_CHAIN_F_NONE              0x00U
+#define        LDAP_CHAIN_F_CHAINING           0x01U
+
+#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 )
@@ -58,6 +172,11 @@ ldap_chain_cb_search_response( Operation *op, SlapReply *rs )
 {
        assert( op->o_tag == LDAP_REQ_SEARCH );
 
+       /* if in error, don't proceed any further */
+       if ( op->o_callback->sc_private == LDAP_CH_ERR ) {
+               return 0;
+       }
+
        if ( rs->sr_type == REP_SEARCH ) {
                Attribute       **ap = &rs->sr_entry->e_attrs;
 
@@ -79,9 +198,27 @@ ldap_chain_cb_search_response( Operation *op, SlapReply *rs )
                
                return SLAP_CB_CONTINUE;
 
+       } else if ( rs->sr_type == REP_SEARCHREF ) {
+               /* if we get it here, it means the library was unable
+                * to chase the referral... */
+
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+               if ( get_chaining( op ) > SLAP_CONTROL_IGNORED ) {
+                       switch ( get_continuationBehavior( op ) ) {
+                       case SLAP_CH_RESOLVE_CHAINING_REQUIRED:
+                               op->o_callback->sc_private = LDAP_CH_ERR;
+                               return -1;
+
+                       default:
+                               break;
+                       }
+               }
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
+               return SLAP_CB_CONTINUE;
+
        } else if ( rs->sr_type == REP_RESULT ) {
                /* back-ldap tried to send result */
-               op->o_callback->sc_private = (void *)(1);
+               op->o_callback->sc_private = LDAP_CH_RES;
        }
 
        return 0;
@@ -94,8 +231,13 @@ ldap_chain_cb_search_response( Operation *op, SlapReply *rs )
 static int
 ldap_chain_cb_response( Operation *op, SlapReply *rs )
 {
+       /* if in error, don't proceed any further */
+       if ( op->o_callback->sc_private == LDAP_CH_ERR ) {
+               return 0;
+       }
+
        if ( rs->sr_type == REP_RESULT ) {
-               op->o_callback->sc_private = (void *)(1);
+               op->o_callback->sc_private = LDAP_CH_RES;
 
        } else if ( op->o_tag == LDAP_REQ_SEARCH && rs->sr_type == REP_SEARCH )
        {
@@ -114,12 +256,22 @@ ldap_chain_op(
        BerVarray       ref )
 {
        slap_overinst   *on = (slap_overinst *) op->o_bd->bd_info;
-       struct ldapinfo li, *lip = (struct ldapinfo *)on->on_bi.bi_private;
-       int             rc;
+       ldap_chain_t    *lc = (ldap_chain_t *)on->on_bi.bi_private;
+       struct ldapinfo li, *lip = lc->lc_li;
+
+       /* 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 = on->on_bi.bi_private;
-               return ( *op_f )( op, rs );
+               op->o_bd->be_private = lip;
+               rc = ( *op_f )( op, rs );
+               goto done;
        }
 
        li = *lip;
@@ -187,13 +339,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 };
@@ -202,12 +359,47 @@ ldap_chain_response( Operation *op, SlapReply *rs )
        BerVarray       ref;
        struct berval   ndn = op->o_ndn;
 
-       struct ldapinfo li, *lip = (struct ldapinfo *)on->on_bi.bi_private;
+       ldap_chain_t    *lc = (ldap_chain_t *)on->on_bi.bi_private;
+       struct ldapinfo li, *lip = lc->lc_li;
+
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+       int             sr_err = rs->sr_err;
+       slap_reply_t    sr_type = rs->sr_type;
+       slap_mask_t     chain_mask = 0;
+       ber_len_t       chain_shift = 0;
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
 
        if ( rs->sr_err != LDAP_REFERRAL && rs->sr_type != REP_SEARCHREF ) {
                return SLAP_CB_CONTINUE;
        }
 
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+       if ( rs->sr_err == LDAP_REFERRAL && get_chaining( op ) > SLAP_CONTROL_IGNORED ) {
+               switch ( get_resolveBehavior( op ) ) {
+               case SLAP_CH_RESOLVE_REFERRALS_PREFERRED:
+               case SLAP_CH_RESOLVE_REFERRALS_REQUIRED:
+                       return SLAP_CB_CONTINUE;
+
+               default:
+                       chain_mask = SLAP_CH_RESOLVE_MASK;
+                       chain_shift = SLAP_CH_RESOLVE_SHIFT;
+                       break;
+               }
+
+       } else if ( rs->sr_type == REP_SEARCHREF && get_chaining( op ) > SLAP_CONTROL_IGNORED ) {
+               switch ( get_continuationBehavior( op ) ) {
+               case SLAP_CH_CONTINUATION_REFERRALS_PREFERRED:
+               case SLAP_CH_CONTINUATION_REFERRALS_REQUIRED:
+                       return SLAP_CB_CONTINUE;
+
+               default:
+                       chain_mask = SLAP_CH_CONTINUATION_MASK;
+                       chain_shift = SLAP_CH_CONTINUATION_SHIFT;
+                       break;
+               }
+       }
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
+
        /*
         * TODO: add checks on who/when chain operations; e.g.:
         *   a) what identities are authorized
@@ -254,6 +446,14 @@ ldap_chain_response( Operation *op, SlapReply *rs )
                        char            textbuf[ SLAP_TEXT_BUFLEN ];
                        size_t          textlen = sizeof( textbuf );
 
+#if 0
+                       /* FIXME: op->o_bd is still set to the BackendDB 
+                        * structure of the database that tried to handle
+                        * the operation and actually returned a referral
+                        * ... */
+                       assert( SLAP_DBFLAGS( op->o_bd ) & SLAP_DBFLAG_GLOBAL_OVERLAY );
+#endif
+
                        /* global overlay: create entry */
                        /* NOTE: this is a hack to use the chain overlay
                         * as global.  I expect to be able to remove this
@@ -294,6 +494,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;
@@ -362,8 +568,14 @@ ldap_chain_response( Operation *op, SlapReply *rs )
                                if ( rc == LDAP_SUCCESS && rs->sr_err == LDAP_SUCCESS ) {
                                        break;
                                }
+
+                               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;
@@ -393,12 +605,38 @@ ldap_chain_response( Operation *op, SlapReply *rs )
                break;
        }
 
-       if ( sc2.sc_private == NULL ) {
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+       if ( rc != LDAP_SUCCESS || sc2.sc_private == LDAP_CH_ERR ) {
+               if ( rs->sr_err == LDAP_CANNOT_CHAIN ) {
+                       goto cannot_chain;
+               }
+
+               switch ( ( get_chainingBehavior( op ) & chain_mask ) >> chain_shift ) {
+               case LDAP_CHAINING_REQUIRED:
+cannot_chain:;
+                       op->o_callback = NULL;
+                       send_ldap_error( op, rs, LDAP_CANNOT_CHAIN, "operation cannot be completed without chaining" );
+                       break;
+
+               default:
+                       rc = SLAP_CB_CONTINUE;
+                       rs->sr_err = sr_err;
+                       rs->sr_type = sr_type;
+                       break;
+               }
+               goto dont_chain;
+       }
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
+
+       if ( sc2.sc_private == LDAP_CH_NONE ) {
                op->o_callback = NULL;
                rc = rs->sr_err = slap_map_api2result( rs );
                send_ldap_result( op, rs );
        }
 
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+dont_chain:;
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
        op->o_do_not_cache = cache;
        op->o_bd->be_private = private;
        op->o_callback = sc;
@@ -408,6 +646,33 @@ ldap_chain_response( Operation *op, SlapReply *rs )
        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 )
+{
+       if ( strcasecmp( s, "chainingPreferred" ) == 0 ) {
+               return LDAP_CHAINING_PREFERRED;
+               
+       } else if ( strcasecmp( s, "chainingRequired" ) == 0 ) {
+               return LDAP_CHAINING_REQUIRED;
+
+       } else if ( strcasecmp( s, "referralsPreferred" ) == 0 ) {
+               return LDAP_REFERRALS_PREFERRED;
+               
+       } else if ( strcasecmp( s, "referralsRequired" ) == 0 ) {
+               return LDAP_REFERRALS_REQUIRED;
+       }
+
+       return -1;
+}
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
+
 static int
 ldap_chain_db_config(
        BackendDB       *be,
@@ -418,21 +683,140 @@ ldap_chain_db_config(
 )
 {
        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;
 
-       be->be_private = on->on_bi.bi_private;
-       if ( strncasecmp( argv[ 0 ], "chain-", sizeof( "chain-" ) - 1 ) == 0 ) {
+       if ( strncasecmp( argv[ 0 ], "chain-", STRLENOF( "chain-" ) ) == 0 ) {
                argv0 = argv[ 0 ];
-               argv[ 0 ] = &argv[ 0 ][ sizeof( "chain-" ) - 1 ];
+               argv[ 0 ] = &argv[ 0 ][ STRLENOF( "chain-" ) ];
+
+#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 };
+
+                       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, tmpargv[ 0 ] );
+                                               return 1;
+                                       }
+
+                               } 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, tmpargv[ 0 ] );
+                                               return 1;
+                                       }
+
+                               } else if ( strcasecmp( tmpargv[ 0 ], "critical" ) == 0 ) {
+                                       iscritical = 1;
+
+                               } else {
+                                       fprintf( stderr, "%s line %d: "
+                                               "unknown option in \"chain-chaining\"\n",
+                                               fname, 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",
+                                               fname, 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",
+                                                       fname, 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",
+                                               fname, 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",
+                                       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;
+
+                       rc = 0;
+                       goto done;
+               }
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
        }
+
+
+       be->be_private = lc->lc_li;
        rc = lback->bi_db_config( be, fname, lineno, argc, argv );
+       be->be_private = private;
+
+done:;
        if ( argv0 ) {
                argv[ 0 ] = argv0;
        }
-       
-       be->be_private = private;
+
        return rc;
 }
 
@@ -442,6 +826,7 @@ ldap_chain_db_init(
 )
 {
        slap_overinst   *on = (slap_overinst *)be->bd_info;
+       ldap_chain_t    *lc = NULL;
        int             rc;
        BackendDB       bd = *be;
 
@@ -453,9 +838,27 @@ ldap_chain_db_init(
                }
        }
 
+       lc = ch_malloc( sizeof( ldap_chain_t ) );
+       memset( lc, 0, sizeof( ldap_chain_t ) );
+
        bd.be_private = NULL;
        rc = lback->bi_db_init( &bd );
-       on->on_bi.bi_private = bd.be_private;
+       lc->lc_li = (struct ldapinfo *)bd.be_private;
+       on->on_bi.bi_private = (void *)lc;
+
+       return rc;
+}
+
+static int
+ldap_chain_db_open(
+       BackendDB *be
+)
+{
+       int     rc = 0;
+
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+       rc = overlay_register_control( be, LDAP_CONTROL_X_CHAINING_BEHAVIOR );
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
 
        return rc;
 }
@@ -465,38 +868,202 @@ ldap_chain_db_destroy(
        BackendDB *be
 )
 {
-       slap_overinst *on = (slap_overinst *) be->bd_info;
-       void *private = be->be_private;
-       int rc;
+       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;
+       int             rc;
 
-       be->be_private = on->on_bi.bi_private;
+       be->be_private = (void *)lc->lc_li;
        rc = lback->bi_db_destroy( be );
-       on->on_bi.bi_private = be->be_private;
+       lc->lc_li = be->be_private;
+       ch_free( lc );
+       on->on_bi.bi_private = NULL;
+       be->be_private = private;
+       return rc;
+}
+
+static int
+ldap_chain_connection_destroy(
+       BackendDB *be,
+       Connection *conn
+)
+{
+       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;
+       int             rc;
+
+       be->be_private = (void *)lc->lc_li;
+       rc = lback->bi_connection_destroy( be, conn );
        be->be_private = private;
+
        return rc;
 }
 
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+static int
+ldap_chain_parse_ctrl(
+       Operation       *op,
+       SlapReply       *rs,
+       LDAPControl     *ctrl )
+{
+       ber_tag_t       tag;
+       BerElement      *ber;
+       ber_int_t       mode,
+                       behavior;
+
+       if ( get_chaining( op ) != SLAP_CONTROL_NONE ) {
+               rs->sr_text = "Chaining behavior control specified multiple times";
+               return LDAP_PROTOCOL_ERROR;
+       }
+
+       if ( op->o_pagedresults != SLAP_CONTROL_NONE ) {
+               rs->sr_text = "Chaining behavior control specified with pagedResults control";
+               return LDAP_PROTOCOL_ERROR;
+       }
+
+       if ( BER_BVISEMPTY( &ctrl->ldctl_value ) ) {
+               mode = (SLAP_CH_RESOLVE_DEFAULT|SLAP_CH_CONTINUATION_DEFAULT);
+
+       } else {
+               ber_len_t       len;
+
+               /* Parse the control value
+                *      ChainingBehavior ::= SEQUENCE { 
+                *           resolveBehavior         Behavior OPTIONAL, 
+                *           continuationBehavior    Behavior OPTIONAL } 
+                *                             
+                *      Behavior :: = ENUMERATED { 
+                *           chainingPreferred       (0), 
+                *           chainingRequired        (1), 
+                *           referralsPreferred      (2), 
+                *           referralsRequired       (3) } 
+                */
+
+               ber = ber_init( &ctrl->ldctl_value );
+               if( ber == NULL ) {
+                       rs->sr_text = "internal error";
+                       return LDAP_OTHER;
+               }
+
+               tag = ber_scanf( ber, "{e" /* } */, &behavior );
+               /* FIXME: since the whole SEQUENCE is optional,
+                * should we accept no enumerations at all? */
+               if ( tag != LBER_ENUMERATED ) {
+                       rs->sr_text = "Chaining behavior control: resolveBehavior decoding error";
+                       return LDAP_PROTOCOL_ERROR;
+               }
+
+               switch ( behavior ) {
+               case LDAP_CHAINING_PREFERRED:
+                       mode = SLAP_CH_RESOLVE_CHAINING_PREFERRED;
+                       break;
+
+               case LDAP_CHAINING_REQUIRED:
+                       mode = SLAP_CH_RESOLVE_CHAINING_REQUIRED;
+                       break;
+
+               case LDAP_REFERRALS_PREFERRED:
+                       mode = SLAP_CH_RESOLVE_REFERRALS_PREFERRED;
+                       break;
+
+               case LDAP_REFERRALS_REQUIRED:
+                       mode = SLAP_CH_RESOLVE_REFERRALS_REQUIRED;
+                       break;
+
+               default:
+                       rs->sr_text = "Chaining behavior control: unknown resolveBehavior";
+                       return LDAP_PROTOCOL_ERROR;
+               }
+
+               tag = ber_peek_tag( ber, &len );
+               if ( tag == LBER_ENUMERATED ) {
+                       tag = ber_scanf( ber, "e", &behavior );
+                       if ( tag == LBER_ERROR ) {
+                               rs->sr_text = "Chaining behavior control: continuationBehavior decoding error";
+                               return LDAP_PROTOCOL_ERROR;
+                       }
+               }
+
+               if ( tag == LBER_DEFAULT ) {
+                       mode |= SLAP_CH_CONTINUATION_DEFAULT;
+
+               } else {
+                       switch ( behavior ) {
+                       case LDAP_CHAINING_PREFERRED:
+                               mode |= SLAP_CH_CONTINUATION_CHAINING_PREFERRED;
+                               break;
+
+                       case LDAP_CHAINING_REQUIRED:
+                               mode |= SLAP_CH_CONTINUATION_CHAINING_REQUIRED;
+                               break;
+
+                       case LDAP_REFERRALS_PREFERRED:
+                               mode |= SLAP_CH_CONTINUATION_REFERRALS_PREFERRED;
+                               break;
+
+                       case LDAP_REFERRALS_REQUIRED:
+                               mode |= SLAP_CH_CONTINUATION_REFERRALS_REQUIRED;
+                               break;
+
+                       default:
+                               rs->sr_text = "Chaining behavior control: unknown continuationBehavior";
+                               return LDAP_PROTOCOL_ERROR;
+                       }
+               }
+
+               if ( ( ber_scanf( ber, /* { */ "}") ) == LBER_ERROR ) {
+                       rs->sr_text = "Chaining behavior control: decoding error";
+                       return LDAP_PROTOCOL_ERROR;
+               }
+
+               (void) ber_free( ber, 1 );
+       }
+
+       op->o_chaining = mode | ( ctrl->ldctl_iscritical
+                       ? SLAP_CONTROL_CRITICAL
+                       : SLAP_CONTROL_NONCRITICAL );
+
+       return LDAP_SUCCESS;
+}
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
+
 static slap_overinst ldapchain;
 
 int
 chain_init( void )
 {
+#ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
+       int     rc;
+
+       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 );
+       if ( rc != LDAP_SUCCESS ) {
+               fprintf( stderr, "Failed to register chaining behavior control: %d\n", rc );
+               return rc;
+       }
+#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
+
        ldapchain.on_bi.bi_type = "chain";
        ldapchain.on_bi.bi_db_init = ldap_chain_db_init;
+       ldapchain.on_bi.bi_db_open = ldap_chain_db_open;
        ldapchain.on_bi.bi_db_config = ldap_chain_db_config;
        ldapchain.on_bi.bi_db_destroy = ldap_chain_db_destroy;
-       
+
        /* ... otherwise the underlying backend's function would be called,
         * likely passing an invalid entry; on the contrary, the requested
         * operational attributes should have been returned while chasing
         * the referrals.  This all in all is a bit messy, because part
-        * of the operational attributes are generated by they backend;
+        * of the operational attributes are generated by the backend;
         * part by the frontend; back-ldap should receive all the available
-        * ones from the remote server, but then, on it own, it strips those
+        * ones from the remote server, but then, on its own, it strips those
         * it assumes will be (re)generated by the frontend (e.g.
         * subschemaSubentry.) */
        ldapchain.on_bi.bi_operational = ldap_chain_operational;
        
+       ldapchain.on_bi.bi_connection_destroy = ldap_chain_connection_destroy;
+
        ldapchain.on_response = ldap_chain_response;
 
        return overlay_register( &ldapchain );