]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/controls.c
ITS#5379 HAVE_TLS dependency
[openldap] / servers / slapd / controls.c
index 426b9cb02c9377b6133dd2c8a6aab608a947bbb4..b7f66eeab2faa2a1aa441295f814b7f40bc1a65b 100644 (file)
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 #include <ac/socket.h>
 
 #include "slap.h"
+#include "ldif.h"
+#include "lutil.h"
 
 #include "../../libraries/liblber/lber-int.h"
 
 static SLAP_CTRL_PARSE_FN parseAssert;
-static SLAP_CTRL_PARSE_FN parsePreRead;
-static SLAP_CTRL_PARSE_FN parsePostRead;
-static SLAP_CTRL_PARSE_FN parseProxyAuthz;
-#ifdef LDAP_DEVEL
+static SLAP_CTRL_PARSE_FN parseDomainScope;
 static SLAP_CTRL_PARSE_FN parseDontUseCopy;
-static SLAP_CTRL_PARSE_FN parseManageDIT;
-#endif
 static SLAP_CTRL_PARSE_FN parseManageDSAit;
 static SLAP_CTRL_PARSE_FN parseNoOp;
 static SLAP_CTRL_PARSE_FN parsePagedResults;
-#ifdef LDAP_DEVEL
+static SLAP_CTRL_PARSE_FN parsePermissiveModify;
+static SLAP_CTRL_PARSE_FN parsePreRead, parsePostRead;
+static SLAP_CTRL_PARSE_FN parseProxyAuthz;
+static SLAP_CTRL_PARSE_FN parseRelax;
+static SLAP_CTRL_PARSE_FN parseSearchOptions;
+#ifdef SLAP_CONTROL_X_SORTEDRESULTS
 static SLAP_CTRL_PARSE_FN parseSortedResults;
 #endif
-static SLAP_CTRL_PARSE_FN parseValuesReturnFilter;
-static SLAP_CTRL_PARSE_FN parsePermissiveModify;
-static SLAP_CTRL_PARSE_FN parseDomainScope;
+static SLAP_CTRL_PARSE_FN parseSubentries;
 #ifdef SLAP_CONTROL_X_TREE_DELETE
 static SLAP_CTRL_PARSE_FN parseTreeDelete;
 #endif
-static SLAP_CTRL_PARSE_FN parseSearchOptions;
-static SLAP_CTRL_PARSE_FN parseSubentries;
+static SLAP_CTRL_PARSE_FN parseValuesReturnFilter;
+#ifdef SLAP_CONTROL_X_SESSION_TRACKING
+static SLAP_CTRL_PARSE_FN parseSessionTracking;
+#endif
 
 #undef sc_mask /* avoid conflict with Irix 6.5 <sys/signal.h> */
 
@@ -96,7 +98,7 @@ static int num_known_controls = 1;
 
 static char *proxy_authz_extops[] = {
        LDAP_EXOP_MODIFY_PASSWD,
-       LDAP_EXOP_X_WHO_AM_I,
+       LDAP_EXOP_WHO_AM_I,
        LDAP_EXOP_REFRESH,
        NULL
 };
@@ -106,6 +108,15 @@ static char *manageDSAit_extops[] = {
        NULL
 };
 
+#ifdef SLAP_CONTROL_X_SESSION_TRACKING
+static char *session_tracking_extops[] = {
+       LDAP_EXOP_MODIFY_PASSWD,
+       LDAP_EXOP_WHO_AM_I,
+       LDAP_EXOP_REFRESH,
+       NULL
+};
+#endif
+
 static struct slap_control control_defs[] = {
        {  LDAP_CONTROL_ASSERT,
                (int)offsetof(struct slap_control_ids, sc_assert),
@@ -133,7 +144,7 @@ static struct slap_control control_defs[] = {
                SLAP_CTRL_SEARCH,
                NULL, NULL,
                parsePagedResults, LDAP_SLIST_ENTRY_INITIALIZER(next) },
-#ifdef LDAP_DEVEL
+#ifdef SLAP_CONTROL_X_SORTEDRESULTS
        { LDAP_CONTROL_SORTREQUEST,
                (int)offsetof(struct slap_control_ids, sc_sortedResults),
                SLAP_CTRL_GLOBAL|SLAP_CTRL_SEARCH|SLAP_CTRL_HIDE,
@@ -145,6 +156,11 @@ static struct slap_control control_defs[] = {
                SLAP_CTRL_GLOBAL|SLAP_CTRL_SEARCH|SLAP_CTRL_HIDE,
                NULL, NULL,
                parseDomainScope, LDAP_SLIST_ENTRY_INITIALIZER(next) },
+       { LDAP_CONTROL_DONTUSECOPY,
+               (int)offsetof(struct slap_control_ids, sc_dontUseCopy),
+               SLAP_CTRL_GLOBAL|SLAP_CTRL_INTROGATE|SLAP_CTRL_HIDE,
+               NULL, NULL,
+               parseDontUseCopy, LDAP_SLIST_ENTRY_INITIALIZER(next) },
        { LDAP_CONTROL_X_PERMISSIVE_MODIFY,
                (int)offsetof(struct slap_control_ids, sc_permissiveModify),
                SLAP_CTRL_MODIFY|SLAP_CTRL_HIDE,
@@ -172,17 +188,17 @@ static struct slap_control control_defs[] = {
                SLAP_CTRL_ACCESS|SLAP_CTRL_HIDE,
                NULL, NULL,
                parseNoOp, LDAP_SLIST_ENTRY_INITIALIZER(next) },
-#ifdef LDAP_DEVEL
-       { LDAP_CONTROL_DONTUSECOPY,
-               (int)offsetof(struct slap_control_ids, sc_dontUseCopy),
-               SLAP_CTRL_INTROGATE|SLAP_CTRL_HIDE,
-               NULL, NULL,
-               parseDontUseCopy, LDAP_SLIST_ENTRY_INITIALIZER(next) },
-       { LDAP_CONTROL_MANAGEDIT,
-               (int)offsetof(struct slap_control_ids, sc_manageDIT),
+       { LDAP_CONTROL_RELAX,
+               (int)offsetof(struct slap_control_ids, sc_relax),
                SLAP_CTRL_GLOBAL|SLAP_CTRL_UPDATE|SLAP_CTRL_HIDE,
                NULL, NULL,
-               parseManageDIT, LDAP_SLIST_ENTRY_INITIALIZER(next) },
+               parseRelax, LDAP_SLIST_ENTRY_INITIALIZER(next) },
+#ifdef LDAP_X_TXN
+       { LDAP_CONTROL_X_TXN_SPEC,
+               (int)offsetof(struct slap_control_ids, sc_txnSpec),
+               SLAP_CTRL_UPDATE|SLAP_CTRL_HIDE,
+               NULL, NULL,
+               txn_spec_ctrl, LDAP_SLIST_ENTRY_INITIALIZER(next) },
 #endif
        { LDAP_CONTROL_MANAGEDSAIT,
                (int)offsetof(struct slap_control_ids, sc_manageDSAit),
@@ -194,7 +210,14 @@ static struct slap_control control_defs[] = {
                SLAP_CTRL_GLOBAL|SLAP_CTRL_ACCESS,
                proxy_authz_extops, NULL,
                parseProxyAuthz, LDAP_SLIST_ENTRY_INITIALIZER(next) },
-       { NULL, 0, 0, NULL, 0, LDAP_SLIST_ENTRY_INITIALIZER(next) }
+#ifdef SLAP_CONTROL_X_SESSION_TRACKING
+       { LDAP_CONTROL_X_SESSION_TRACKING,
+               (int)offsetof(struct slap_control_ids, sc_sessionTracking),
+               SLAP_CTRL_GLOBAL|SLAP_CTRL_ACCESS|SLAP_CTRL_BIND|SLAP_CTRL_HIDE,
+               session_tracking_extops, NULL,
+               parseSessionTracking, LDAP_SLIST_ENTRY_INITIALIZER(next) },
+#endif
+       { NULL, 0, 0, NULL, 0, NULL, LDAP_SLIST_ENTRY_INITIALIZER(next) }
 };
 
 static struct slap_control *
@@ -286,7 +309,17 @@ register_supported_control2(const char *controloid,
 
        } else {
                if ( sc->sc_extendedopsbv ) {
-                       ber_bvarray_free( sc->sc_extendedops );
+                       /* FIXME: in principle, we should rather merge
+                        * existing extops with those supported by the
+                        * new control handling implementation.
+                        * In fact, whether a control is compatible with
+                        * an extop should not be a matter of implementation.
+                        * We likely also need a means for a newly
+                        * registered extop to declare that it is
+                        * comptible with an already registered control.
+                        */
+                       ber_bvarray_free( sc->sc_extendedopsbv );
+                       sc->sc_extendedopsbv = NULL;
                        sc->sc_extendedops = NULL;
                }
        }
@@ -403,7 +436,7 @@ get_supported_controls(char ***ctrloidsp,
        }
        masks = (slap_mask_t *)SLAP_MALLOC( (n + 1) * sizeof(slap_mask_t) );
        if  ( masks == NULL ) {
-               ch_free( oids );
+               SLAP_FREE( oids );
                return LDAP_NO_MEMORY;
        }
 
@@ -475,9 +508,11 @@ slap_global_control( Operation *op, const char *oid, int *cid )
                return LDAP_COMPARE_TRUE;
        }
 
+#if 0
        Debug( LDAP_DEBUG_TRACE,
                "slap_global_control: unavailable control: %s\n",      
                oid, 0, 0 );
+#endif
 
        return LDAP_COMPARE_FALSE;
 }
@@ -825,7 +860,6 @@ slap_remove_control(
        return rs->sr_err;
 }
 
-#ifdef LDAP_DEVEL
 static int parseDontUseCopy (
        Operation *op,
        SlapReply *rs,
@@ -836,12 +870,12 @@ static int parseDontUseCopy (
                return LDAP_PROTOCOL_ERROR;
        }
 
-       if ( ctrl->ldctl_value.bv_len ) {
-               rs->sr_text = "dontUseCopy control value not empty";
+       if ( !BER_BVISNULL( &ctrl->ldctl_value )) {
+               rs->sr_text = "dontUseCopy control value not absent";
                return LDAP_PROTOCOL_ERROR;
        }
 
-       if ( ctrl->ldctl_iscritical != SLAP_CONTROL_CRITICAL ) {
+       if ( !ctrl->ldctl_iscritical ) {
                rs->sr_text = "dontUseCopy criticality of FALSE not allowed";
                return LDAP_PROTOCOL_ERROR;
        }
@@ -850,28 +884,27 @@ static int parseDontUseCopy (
        return LDAP_SUCCESS;
 }
 
-static int parseManageDIT (
+static int parseRelax (
        Operation *op,
        SlapReply *rs,
        LDAPControl *ctrl )
 {
-       if ( op->o_managedit != SLAP_CONTROL_NONE ) {
-               rs->sr_text = "manageDIT control specified multiple times";
+       if ( op->o_relax != SLAP_CONTROL_NONE ) {
+               rs->sr_text = "relax control specified multiple times";
                return LDAP_PROTOCOL_ERROR;
        }
 
-       if ( ctrl->ldctl_value.bv_len ) {
-               rs->sr_text = "manageDIT control value not empty";
+       if ( !BER_BVISNULL( &ctrl->ldctl_value )) {
+               rs->sr_text = "relax control value not absent";
                return LDAP_PROTOCOL_ERROR;
        }
 
-       op->o_managedit = ctrl->ldctl_iscritical
+       op->o_relax = ctrl->ldctl_iscritical
                ? SLAP_CONTROL_CRITICAL
                : SLAP_CONTROL_NONCRITICAL;
 
        return LDAP_SUCCESS;
 }
-#endif
 
 static int parseManageDSAit (
        Operation *op,
@@ -883,8 +916,8 @@ static int parseManageDSAit (
                return LDAP_PROTOCOL_ERROR;
        }
 
-       if ( ctrl->ldctl_value.bv_len ) {
-               rs->sr_text = "manageDSAit control value not empty";
+       if ( !BER_BVISNULL( &ctrl->ldctl_value )) {
+               rs->sr_text = "manageDSAit control value not absent";
                return LDAP_PROTOCOL_ERROR;
        }
 
@@ -908,11 +941,16 @@ static int parseProxyAuthz (
                return LDAP_PROTOCOL_ERROR;
        }
 
+       if ( BER_BVISNULL( &ctrl->ldctl_value )) {
+               rs->sr_text = "proxy authorization control value absent";
+               return LDAP_PROTOCOL_ERROR;
+       }
+
        if ( !( global_allows & SLAP_ALLOW_PROXY_AUTHZ_ANON )
                && BER_BVISEMPTY( &op->o_ndn ) )
        {
-               rs->sr_text = "anonymous proxyAuthz not allowed";
-               return LDAP_PROXY_AUTHZ_FAILURE;
+               rs->sr_text = "anonymous proxied authorization not allowed";
+               return LDAP_PROXIED_AUTHORIZATION_DENIED;
        }
 
        op->o_proxy_authz = ctrl->ldctl_iscritical
@@ -925,7 +963,7 @@ static int parseProxyAuthz (
                ctrl->ldctl_value.bv_len ?  ctrl->ldctl_value.bv_val : "anonymous",
                0 );
 
-       if ( ctrl->ldctl_value.bv_len == 0 ) {
+       if ( BER_BVISEMPTY( &ctrl->ldctl_value )) {
                Debug( LDAP_DEBUG_TRACE,
                        "parseProxyAuthz: conn=%lu anonymous\n", 
                        op->o_connid, 0, 0 );
@@ -953,7 +991,7 @@ static int parseProxyAuthz (
                        ch_free( dn.bv_val );
                }
                rs->sr_text = "authzId mapping failed";
-               return LDAP_PROXY_AUTHZ_FAILURE;
+               return LDAP_PROXIED_AUTHORIZATION_DENIED;
        }
 
        Debug( LDAP_DEBUG_TRACE,
@@ -966,7 +1004,7 @@ static int parseProxyAuthz (
        if ( rc ) {
                ch_free( dn.bv_val );
                rs->sr_text = "not authorized to assume identity";
-               return LDAP_PROXY_AUTHZ_FAILURE;
+               return LDAP_PROXIED_AUTHORIZATION_DENIED;
        }
 
        ch_free( op->o_ndn.bv_val );
@@ -979,7 +1017,6 @@ static int parseProxyAuthz (
        op->o_ndn = dn;
        ber_dupbv( &op->o_dn, &dn );
 
-
        Statslog( LDAP_DEBUG_STATS, "%s PROXYAUTHZ dn=\"%s\"\n",
            op->o_log_prefix, dn.bv_val, 0, 0, 0 );
 
@@ -996,7 +1033,7 @@ static int parseNoOp (
                return LDAP_PROTOCOL_ERROR;
        }
 
-       if ( ctrl->ldctl_value.bv_len ) {
+       if ( !BER_BVISNULL( &ctrl->ldctl_value ) ) {
                rs->sr_text = "noop control value not empty";
                return LDAP_PROTOCOL_ERROR;
        }
@@ -1013,20 +1050,26 @@ static int parsePagedResults (
        SlapReply *rs,
        LDAPControl *ctrl )
 {
+       BerElementBuffer berbuf;
+       BerElement      *ber = (BerElement *)&berbuf;
+       struct berval   cookie;
+       PagedResultsState       *ps;
        int             rc = LDAP_SUCCESS;
        ber_tag_t       tag;
        ber_int_t       size;
-       BerElement      *ber;
-       struct berval   cookie = BER_BVNULL;
-       PagedResultsState       *ps;
 
        if ( op->o_pagedresults != SLAP_CONTROL_NONE ) {
                rs->sr_text = "paged results control specified multiple times";
                return LDAP_PROTOCOL_ERROR;
        }
 
+       if ( BER_BVISNULL( &ctrl->ldctl_value ) ) {
+               rs->sr_text = "paged results control value is absent";
+               return LDAP_PROTOCOL_ERROR;
+       }
+
        if ( BER_BVISEMPTY( &ctrl->ldctl_value ) ) {
-               rs->sr_text = "paged results control value is empty (or absent)";
+               rs->sr_text = "paged results control value is empty";
                return LDAP_PROTOCOL_ERROR;
        }
 
@@ -1038,11 +1081,7 @@ static int parsePagedResults (
         *              cookie  OCTET STRING
         * }
         */
-       ber = ber_init( &ctrl->ldctl_value );
-       if ( ber == NULL ) {
-               rs->sr_text = "internal error";
-               return LDAP_OTHER;
-       }
+       ber_init2( ber, &ctrl->ldctl_value, LBER_USE_DER );
 
        tag = ber_scanf( ber, "{im}", &size, &cookie );
 
@@ -1061,6 +1100,7 @@ static int parsePagedResults (
        ps = op->o_tmpalloc( sizeof(PagedResultsState), op->o_tmpmemctx );
        *ps = op->o_conn->c_pagedresults_state;
        ps->ps_size = size;
+       ps->ps_cookieval = cookie;
        op->o_pagedresults_state = ps;
 
        /* NOTE: according to RFC 2696 3.:
@@ -1084,11 +1124,10 @@ static int parsePagedResults (
        }
 
 done:;
-       (void)ber_free( ber, 1 );
        return rc;
 }
 
-#ifdef LDAP_DEVEL
+#ifdef SLAP_CONTROL_X_SORTEDRESULTS
 static int parseSortedResults (
        Operation *op,
        SlapReply *rs,
@@ -1101,8 +1140,13 @@ static int parseSortedResults (
                return LDAP_PROTOCOL_ERROR;
        }
 
+       if ( BER_BVISNULL( &ctrl->ldctl_value ) ) {
+               rs->sr_text = "sorted results control value is absent";
+               return LDAP_PROTOCOL_ERROR;
+       }
+
        if ( BER_BVISEMPTY( &ctrl->ldctl_value ) ) {
-               rs->sr_text = "sorted results control value is empty (or absent)";
+               rs->sr_text = "sorted results control value is empty";
                return LDAP_PROTOCOL_ERROR;
        }
 
@@ -1129,8 +1173,13 @@ static int parseAssert (
                return LDAP_PROTOCOL_ERROR;
        }
 
-       if ( ctrl->ldctl_value.bv_len == 0 ) {
-               rs->sr_text = "assert control value is empty (or absent)";
+       if ( BER_BVISNULL( &ctrl->ldctl_value )) {
+               rs->sr_text = "assert control value is absent";
+               return LDAP_PROTOCOL_ERROR;
+       }
+
+       if ( BER_BVISEMPTY( &ctrl->ldctl_value )) {
+               rs->sr_text = "assert control value is empty";
                return LDAP_PROTOCOL_ERROR;
        }
 
@@ -1142,6 +1191,7 @@ static int parseAssert (
        
        rs->sr_err = get_filter( op, ber, (Filter **)&(op->o_assertion),
                &rs->sr_text);
+       (void) ber_free( ber, 1 );
        if( rs->sr_err != LDAP_SUCCESS ) {
                if( rs->sr_err == SLAPD_DISCONNECT ) {
                        rs->sr_err = LDAP_PROTOCOL_ERROR;
@@ -1186,37 +1236,51 @@ static int parsePreRead (
                return LDAP_PROTOCOL_ERROR;
        }
 
-       if ( ctrl->ldctl_value.bv_len == 0 ) {
-               rs->sr_text = "preread control value is empty (or absent)";
+       if ( BER_BVISNULL( &ctrl->ldctl_value )) {
+               rs->sr_text = "preread control value is absent";
                return LDAP_PROTOCOL_ERROR;
        }
 
+       if ( BER_BVISEMPTY( &ctrl->ldctl_value )) {
+               rs->sr_text = "preread control value is empty";
+               return LDAP_PROTOCOL_ERROR;
+       }
+
+#ifdef LDAP_X_TXN
+       if ( op->o_txnSpec ) { /* temporary limitation */
+               rs->sr_text = "cannot perform pre-read in transaction";
+               return LDAP_UNWILLING_TO_PERFORM;
+       }
+#endif
+
        ber = ber_init( &(ctrl->ldctl_value) );
        if (ber == NULL) {
                rs->sr_text = "preread control: internal error";
                return LDAP_OTHER;
        }
 
+       rs->sr_err = LDAP_SUCCESS;
+
        siz = sizeof( AttributeName );
        off = offsetof( AttributeName, an_name );
        if ( ber_scanf( ber, "{M}", &an, &siz, off ) == LBER_ERROR ) {
                rs->sr_text = "preread control: decoding error";
-               return LDAP_PROTOCOL_ERROR;
+               rs->sr_err = LDAP_PROTOCOL_ERROR;
+               goto done;
        }
 
        for( i=0; i<siz; i++ ) {
-               int             rc = LDAP_SUCCESS;
                const char      *dummy = NULL;
 
                an[i].an_desc = NULL;
                an[i].an_oc = NULL;
                an[i].an_oc_exclude = 0;
-               rc = slap_bv2ad( &an[i].an_name, &an[i].an_desc, &dummy );
-               if ( rc != LDAP_SUCCESS && ctrl->ldctl_iscritical ) {
+               rs->sr_err = slap_bv2ad( &an[i].an_name, &an[i].an_desc, &dummy );
+               if ( rs->sr_err != LDAP_SUCCESS && ctrl->ldctl_iscritical ) {
                        rs->sr_text = dummy
                                ? dummy
                                : "postread control: unknown attributeType";
-                       return rc;
+                       goto done;
                }
        }
 
@@ -1226,8 +1290,9 @@ static int parsePreRead (
 
        op->o_preread_attrs = an;
 
-       rs->sr_err = LDAP_SUCCESS;
-       return LDAP_SUCCESS;
+done:
+       (void) ber_free( ber, 1 );
+       return rs->sr_err;
 }
 
 static int parsePostRead (
@@ -1244,37 +1309,69 @@ static int parsePostRead (
                return LDAP_PROTOCOL_ERROR;
        }
 
-       if ( ctrl->ldctl_value.bv_len == 0 ) {
-               rs->sr_text = "postread control value is empty (or absent)";
+       if ( BER_BVISNULL( &ctrl->ldctl_value )) {
+               rs->sr_text = "postread control value is absent";
+               return LDAP_PROTOCOL_ERROR;
+       }
+
+       if ( BER_BVISEMPTY( &ctrl->ldctl_value )) {
+               rs->sr_text = "postread control value is empty";
                return LDAP_PROTOCOL_ERROR;
        }
 
+#ifdef LDAP_X_TXN
+       if ( op->o_txnSpec ) { /* temporary limitation */
+               rs->sr_text = "cannot perform post-read in transaction";
+               return LDAP_UNWILLING_TO_PERFORM;
+       }
+#endif
+
        ber = ber_init( &(ctrl->ldctl_value) );
        if (ber == NULL) {
                rs->sr_text = "postread control: internal error";
                return LDAP_OTHER;
        }
 
+       rs->sr_err = LDAP_SUCCESS;
        siz = sizeof( AttributeName );
        off = offsetof( AttributeName, an_name );
        if ( ber_scanf( ber, "{M}", &an, &siz, off ) == LBER_ERROR ) {
                rs->sr_text = "postread control: decoding error";
-               return LDAP_PROTOCOL_ERROR;
+               rs->sr_err = LDAP_PROTOCOL_ERROR;
+               goto done;
        }
 
-       for( i=0; i<siz; i++ ) {
-               int             rc = LDAP_SUCCESS;
+       for ( i = 0; i < siz; i++ ) {
                const char      *dummy = NULL;
+               int             rc;
 
                an[i].an_desc = NULL;
                an[i].an_oc = NULL;
                an[i].an_oc_exclude = 0;
                rc = slap_bv2ad( &an[i].an_name, &an[i].an_desc, &dummy );
-               if ( rc != LDAP_SUCCESS && ctrl->ldctl_iscritical ) {
-                       rs->sr_text = dummy
-                               ? dummy
-                               : "postread control: unknown attributeType";
-                       return rc;
+               if ( rc != LDAP_SUCCESS ) {
+                       int                     i;
+                       static struct berval    special_attrs[] = {
+                               BER_BVC( LDAP_NO_ATTRS ),
+                               BER_BVC( LDAP_ALL_USER_ATTRIBUTES ),
+                               BER_BVC( LDAP_ALL_OPERATIONAL_ATTRIBUTES ),
+                               BER_BVNULL
+                       };
+
+                       /* deal with special attribute types */
+                       for ( i = 0; !BER_BVISNULL( &special_attrs[ i ] ); i++ ) {
+                               if ( bvmatch( &an[i].an_name, &special_attrs[ i ] ) ) {
+                                       break;
+                               }
+                       }
+
+                       if ( BER_BVISNULL( &special_attrs[ i ] ) && ctrl->ldctl_iscritical ) {
+                               rs->sr_err = rc;
+                               rs->sr_text = dummy
+                                       ? dummy
+                                       : "postread control: unknown attributeType";
+                               goto done;
+                       }
                }
        }
 
@@ -1284,8 +1381,9 @@ static int parsePostRead (
 
        op->o_postread_attrs = an;
 
-       rs->sr_err = LDAP_SUCCESS;
-       return LDAP_SUCCESS;
+done:
+       (void) ber_free( ber, 1 );
+       return rs->sr_err;
 }
 
 static int parseValuesReturnFilter (
@@ -1301,8 +1399,13 @@ static int parseValuesReturnFilter (
                return LDAP_PROTOCOL_ERROR;
        }
 
-       if ( ctrl->ldctl_value.bv_len == 0 ) {
-               rs->sr_text = "valuesReturnFilter control value is empty (or absent)";
+       if ( BER_BVISNULL( &ctrl->ldctl_value )) {
+               rs->sr_text = "valuesReturnFilter control value is absent";
+               return LDAP_PROTOCOL_ERROR;
+       }
+
+       if ( BER_BVISEMPTY( &ctrl->ldctl_value )) {
+               rs->sr_text = "valuesReturnFilter control value is empty";
                return LDAP_PROTOCOL_ERROR;
        }
 
@@ -1315,6 +1418,8 @@ static int parseValuesReturnFilter (
        rs->sr_err = get_vrFilter( op, ber,
                (ValuesReturnFilter **)&(op->o_vrFilter), &rs->sr_text);
 
+       (void) ber_free( ber, 1 );
+
        if( rs->sr_err != LDAP_SUCCESS ) {
                if( rs->sr_err == SLAPD_DISCONNECT ) {
                        rs->sr_err = LDAP_PROTOCOL_ERROR;
@@ -1383,8 +1488,8 @@ static int parsePermissiveModify (
                return LDAP_PROTOCOL_ERROR;
        }
 
-       if ( ctrl->ldctl_value.bv_len ) {
-               rs->sr_text = "permissiveModify control value not empty";
+       if ( BER_BVISNULL( &ctrl->ldctl_value )) {
+               rs->sr_text = "permissiveModify control value not absent";
                return LDAP_PROTOCOL_ERROR;
        }
 
@@ -1405,7 +1510,7 @@ static int parseDomainScope (
                return LDAP_PROTOCOL_ERROR;
        }
 
-       if ( ctrl->ldctl_value.bv_len ) {
+       if ( BER_BVISNULL( &ctrl->ldctl_value )) {
                rs->sr_text = "domainScope control value not empty";
                return LDAP_PROTOCOL_ERROR;
        }
@@ -1428,8 +1533,8 @@ static int parseTreeDelete (
                return LDAP_PROTOCOL_ERROR;
        }
 
-       if ( ctrl->ldctl_value.bv_len ) {
-               rs->sr_text = "treeDelete control value not empty";
+       if ( !BER_BVISNULL( &ctrl->ldctl_value )) {
+               rs->sr_text = "treeDelete control value not absent";
                return LDAP_PROTOCOL_ERROR;
        }
 
@@ -1450,8 +1555,13 @@ static int parseSearchOptions (
        ber_int_t search_flags;
        ber_tag_t tag;
 
-       if ( ctrl->ldctl_value.bv_len == 0 ) {
-               rs->sr_text = "searchOptions control value is empty (or absent)";
+       if ( BER_BVISNULL( &ctrl->ldctl_value )) {
+               rs->sr_text = "searchOptions control value is absent";
+               return LDAP_PROTOCOL_ERROR;
+       }
+
+       if ( BER_BVISEMPTY( &ctrl->ldctl_value )) {
+               rs->sr_text = "searchOptions control value is empty";
                return LDAP_PROTOCOL_ERROR;
        }
 
@@ -1461,13 +1571,14 @@ static int parseSearchOptions (
                return LDAP_OTHER;
        }
 
-       if ( (tag = ber_scanf( ber, "{i}", &search_flags )) == LBER_ERROR ) {
+       tag = ber_scanf( ber, "{i}", &search_flags );
+       (void) ber_free( ber, 1 );
+
+       if ( tag == LBER_ERROR ) {
                rs->sr_text = "searchOptions control decoding error";
                return LDAP_PROTOCOL_ERROR;
        }
 
-       (void) ber_free( ber, 1 );
-
        if ( search_flags & LDAP_SEARCH_FLAG_DOMAIN_SCOPE ) {
                if ( op->o_domain_scope != SLAP_CONTROL_NONE ) {
                        rs->sr_text = "searchOptions control specified multiple times "
@@ -1492,3 +1603,302 @@ static int parseSearchOptions (
        return LDAP_SUCCESS;
 }
 
+#ifdef SLAP_CONTROL_X_SESSION_TRACKING
+struct berval session_tracking_formats[] = {
+       BER_BVC( LDAP_CONTROL_X_SESSION_TRACKING_RADIUS_ACCT_SESSION_ID ),
+               BER_BVC( "RADIUS-Acct-Session-Id" ),
+       BER_BVC( LDAP_CONTROL_X_SESSION_TRACKING_RADIUS_ACCT_MULTI_SESSION_ID ),
+               BER_BVC( "RADIUS-Acct-Multi-Session-Id" ),
+       BER_BVC( LDAP_CONTROL_X_SESSION_TRACKING_USERNAME ),
+               BER_BVC( "USERNAME" ),
+
+       BER_BVNULL
+};
+
+static int parseSessionTracking(
+       Operation *op,
+       SlapReply *rs,
+       LDAPControl *ctrl )
+{
+       BerElement              *ber;
+       ber_tag_t               tag;
+       ber_len_t               len;
+       int                     i, rc;
+
+       struct berval           sessionSourceIp = BER_BVNULL,
+                               sessionSourceName = BER_BVNULL,
+                               formatOID = BER_BVNULL,
+                               sessionTrackingIdentifier = BER_BVNULL;
+
+       size_t                  st_len, st_pos;
+
+       if ( ctrl->ldctl_iscritical ) {
+               rs->sr_text = "sessionTracking criticality is TRUE";
+               return LDAP_PROTOCOL_ERROR;
+       }
+
+       if ( BER_BVISNULL( &ctrl->ldctl_value ) ) {
+               rs->sr_text = "sessionTracking control value is absent";
+               return LDAP_PROTOCOL_ERROR;
+       }
+
+       if ( BER_BVISEMPTY( &ctrl->ldctl_value ) ) {
+               rs->sr_text = "sessionTracking control value is empty";
+               return LDAP_PROTOCOL_ERROR;
+       }
+
+       /* TODO: add the capability to determine if a client is allowed
+        * to use this control, based on identity, ip and so */
+
+       ber = ber_init( &ctrl->ldctl_value );
+       if ( ber == NULL ) {
+               rs->sr_text = "internal error";
+               return LDAP_OTHER;
+       }
+
+       tag = ber_skip_tag( ber, &len );
+       if ( tag != LBER_SEQUENCE ) {
+               tag = LBER_ERROR;
+               goto error;
+       }
+
+       /* sessionSourceIp */
+       tag = ber_peek_tag( ber, &len );
+       if ( tag == LBER_DEFAULT ) {
+               tag = LBER_ERROR;
+               goto error;
+       }
+
+       if ( len == 0 ) {
+               tag = ber_skip_tag( ber, &len );
+
+       } else if ( len > 128 ) {
+               rs->sr_text = "sessionTracking.sessionSourceIp too long";
+               rs->sr_err = LDAP_PROTOCOL_ERROR;
+               goto error;
+
+       } else {
+               tag = ber_scanf( ber, "m", &sessionSourceIp );
+       }
+
+       if ( ldif_is_not_printable( sessionSourceIp.bv_val, sessionSourceIp.bv_len ) ) {
+               BER_BVZERO( &sessionSourceIp );
+       }
+
+       /* sessionSourceName */
+       tag = ber_peek_tag( ber, &len );
+       if ( tag == LBER_DEFAULT ) {
+               tag = LBER_ERROR;
+               goto error;
+       }
+
+       if ( len == 0 ) {
+               tag = ber_skip_tag( ber, &len );
+
+       } else if ( len > 65536 ) {
+               rs->sr_text = "sessionTracking.sessionSourceName too long";
+               rs->sr_err = LDAP_PROTOCOL_ERROR;
+               goto error;
+
+       } else {
+               tag = ber_scanf( ber, "m", &sessionSourceName );
+       }
+
+       if ( ldif_is_not_printable( sessionSourceName.bv_val, sessionSourceName.bv_len ) ) {
+               BER_BVZERO( &sessionSourceName );
+       }
+
+       /* formatOID */
+       tag = ber_peek_tag( ber, &len );
+       if ( tag == LBER_DEFAULT ) {
+               tag = LBER_ERROR;
+               goto error;
+       }
+
+       if ( len == 0 ) {
+               rs->sr_text = "sessionTracking.formatOID empty";
+               rs->sr_err = LDAP_PROTOCOL_ERROR;
+               goto error;
+
+       } else if ( len > 1024 ) {
+               rs->sr_text = "sessionTracking.formatOID too long";
+               rs->sr_err = LDAP_PROTOCOL_ERROR;
+               goto error;
+
+       } else {
+               tag = ber_scanf( ber, "m", &formatOID );
+       }
+
+       rc = numericoidValidate( NULL, &formatOID );
+       if ( rc != LDAP_SUCCESS ) {
+               rs->sr_text = "sessionTracking.formatOID invalid";
+               goto error;
+       }
+
+       for ( i = 0; !BER_BVISNULL( &session_tracking_formats[ i ] ); i += 2 )
+       {
+               if ( bvmatch( &formatOID, &session_tracking_formats[ i ] ) ) {
+                       formatOID = session_tracking_formats[ i + 1 ];
+                       break;
+               }
+       }
+
+       /* sessionTrackingIdentifier */
+       tag = ber_peek_tag( ber, &len );
+       if ( tag == LBER_DEFAULT ) {
+               tag = LBER_ERROR;
+               goto error;
+       }
+
+       if ( len == 0 ) {
+               tag = ber_skip_tag( ber, &len );
+
+       } else {
+               /* note: should not be more than 65536... */
+               tag = ber_scanf( ber, "m", &sessionTrackingIdentifier );
+               if ( ldif_is_not_printable( sessionTrackingIdentifier.bv_val, sessionTrackingIdentifier.bv_len ) ) {
+                       /* we want the OID printed, at least */
+                       BER_BVSTR( &sessionTrackingIdentifier, "" );
+               }
+       }
+
+       /* closure */
+       tag = ber_skip_tag( ber, &len );
+       if ( tag != LBER_DEFAULT || len != 0 ) {
+               tag = LBER_ERROR;
+               goto error;
+       }
+       tag = 0;
+
+       st_len = 0;
+       if ( !BER_BVISNULL( &sessionSourceIp ) ) {
+               st_len += STRLENOF( "IP=" ) + sessionSourceIp.bv_len;
+       }
+       if ( !BER_BVISNULL( &sessionSourceName ) ) {
+               if ( st_len ) st_len++;
+               st_len += STRLENOF( "NAME=" ) + sessionSourceName.bv_len;
+       }
+       if ( !BER_BVISNULL( &sessionTrackingIdentifier ) ) {
+               if ( st_len ) st_len++;
+               st_len += formatOID.bv_len + STRLENOF( "=" )
+                       + sessionTrackingIdentifier.bv_len;
+       }
+
+       if ( st_len == 0 ) {
+               goto error;
+       }
+
+       st_len += STRLENOF( " []" );
+       st_pos = strlen( op->o_log_prefix );
+
+       if ( sizeof( op->o_log_prefix ) - st_pos > st_len ) {
+               char    *ptr = &op->o_log_prefix[ st_pos ];
+
+               ptr = lutil_strcopy( ptr, " [" /*]*/ );
+
+               st_len = 0;
+               if ( !BER_BVISNULL( &sessionSourceIp ) ) {
+                       ptr = lutil_strcopy( ptr, "IP=" );
+                       ptr = lutil_strcopy( ptr, sessionSourceIp.bv_val );
+                       st_len++;
+               }
+
+               if ( !BER_BVISNULL( &sessionSourceName ) ) {
+                       if ( st_len ) *ptr++ = ' ';
+                       ptr = lutil_strcopy( ptr, "NAME=" );
+                       ptr = lutil_strcopy( ptr, sessionSourceName.bv_val );
+                       st_len++;
+               }
+
+               if ( !BER_BVISNULL( &sessionTrackingIdentifier ) ) {
+                       if ( st_len ) *ptr++ = ' ';
+                       ptr = lutil_strcopy( ptr, formatOID.bv_val );
+                       *ptr++ = '=';
+                       ptr = lutil_strcopy( ptr, sessionTrackingIdentifier.bv_val );
+               }
+
+               *ptr++ = /*[*/ ']';
+               *ptr = '\0';
+       }
+
+error:;
+       (void)ber_free( ber, 1 );
+
+       if ( tag == LBER_ERROR ) {
+               rs->sr_text = "sessionTracking control decoding error";
+               return LDAP_PROTOCOL_ERROR;
+       }
+
+
+       return rs->sr_err;
+}
+
+int
+slap_ctrl_session_tracking_add(
+       Operation *op,
+       SlapReply *rs,
+       struct berval *ip,
+       struct berval *name,
+       struct berval *id,
+       LDAPControl *ctrl )
+{
+       BerElementBuffer berbuf;
+       BerElement      *ber = (BerElement *)&berbuf;
+
+       static struct berval    oid = BER_BVC( LDAP_CONTROL_X_SESSION_TRACKING_USERNAME );
+
+       assert( ctrl != NULL );
+
+       ber_init2( ber, NULL, LBER_USE_DER );
+
+       ber_printf( ber, "{OOOO}", ip, name, &oid, id ); 
+
+       if ( ber_flatten2( ber, &ctrl->ldctl_value, 0 ) == -1 ) {
+               rs->sr_err = LDAP_OTHER;
+               goto done;
+       }
+
+       ctrl->ldctl_oid = LDAP_CONTROL_X_SESSION_TRACKING;
+       ctrl->ldctl_iscritical = 0;
+
+       rs->sr_err = LDAP_SUCCESS;
+
+done:;
+       return rs->sr_err;
+}
+
+int
+slap_ctrl_session_tracking_request_add( Operation *op, SlapReply *rs, LDAPControl *ctrl )
+{
+       static struct berval    bv_unknown = BER_BVC( SLAP_STRING_UNKNOWN );
+       struct berval           ip = BER_BVNULL,
+                               name = BER_BVNULL,
+                               id = BER_BVNULL;
+
+       if ( !BER_BVISNULL( &op->o_conn->c_peer_name ) &&
+               memcmp( op->o_conn->c_peer_name.bv_val, "IP=", STRLENOF( "IP=" ) ) == 0 )
+       {
+               char    *ptr;
+
+               ip.bv_val = op->o_conn->c_peer_name.bv_val + STRLENOF( "IP=" );
+               ip.bv_len = op->o_conn->c_peer_name.bv_len - STRLENOF( "IP=" );
+
+               ptr = ber_bvchr( &ip, ':' );
+               if ( ptr ) {
+                       ip.bv_len = ptr - ip.bv_val;
+               }
+       }
+
+       if ( !BER_BVISNULL( &op->o_conn->c_peer_domain ) &&
+               !bvmatch( &op->o_conn->c_peer_domain, &bv_unknown ) )
+       {
+               name = op->o_conn->c_peer_domain;
+       }
+
+       if ( !BER_BVISNULL( &op->o_dn ) && !BER_BVISEMPTY( &op->o_dn ) ) {
+               id = op->o_dn;
+       }
+
+       return slap_ctrl_session_tracking_add( op, rs, &ip, &name, &id, ctrl );
+}
+#endif