X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fcontrols.c;h=c5aca28721cfa925f4e76cdbbc3d7777dd14c86d;hb=4e15a84452f0493b1b5bc7b779c7bd1cd4fa4b73;hp=ec3712c31abbcedce439ce9f981317114bb4014b;hpb=30831a4012ee11c37809c39c1e2d6d09ae5d2341;p=openldap

diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index ec3712c31a..c5aca28721 100644
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -1,13 +1,18 @@
 /* $OpenLDAP$ */
-/* 
- * Copyright 1999-2000 The OpenLDAP Foundation.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
+
 #include "portable.h"
 
 #include <stdio.h>
@@ -19,14 +24,332 @@
 
 #include "../../libraries/liblber/lber-int.h"
 
-char *supportedControls[] = {
-	LDAP_CONTROL_MANAGEDSAIT,
+static SLAP_CTRL_PARSE_FN parseAssert;
+static SLAP_CTRL_PARSE_FN parsePreRead;
+static SLAP_CTRL_PARSE_FN parsePostRead;
+static SLAP_CTRL_PARSE_FN parseProxyAuthz;
+static SLAP_CTRL_PARSE_FN parseManageDSAit;
+static SLAP_CTRL_PARSE_FN parseModifyIncrement;
+static SLAP_CTRL_PARSE_FN parseNoOp;
+static SLAP_CTRL_PARSE_FN parsePagedResults;
+static SLAP_CTRL_PARSE_FN parseValuesReturnFilter;
+static SLAP_CTRL_PARSE_FN parsePermissiveModify;
+static SLAP_CTRL_PARSE_FN parseDomainScope;
+
+#ifdef LDAP_CONTROL_SUBENTRIES
+static SLAP_CTRL_PARSE_FN parseSubentries;
+#endif
+static SLAP_CTRL_PARSE_FN parseLDAPsync;
+
+#undef sc_mask /* avoid conflict with Irix 6.5 <sys/signal.h> */
+
+const struct berval slap_pre_read_bv = BER_BVC(LDAP_CONTROL_PRE_READ);
+const struct berval slap_post_read_bv = BER_BVC(LDAP_CONTROL_POST_READ);
+
+struct slap_control {
+	/* Control OID */
+	char *sc_oid;
+
+	/* Operations supported by control */
+	slap_mask_t sc_mask;
+
+	/* Extended operations supported by control */
+	char **sc_extendedops;
+
+	/* Control parsing callback */
+	SLAP_CTRL_PARSE_FN *sc_parse;
+
+	LDAP_SLIST_ENTRY(slap_control) sc_next;
+};
+
+static LDAP_SLIST_HEAD(ControlsList, slap_control) controls_list
+	= LDAP_SLIST_HEAD_INITIALIZER(&controls_list);
+
+/*
+ * all known request control OIDs should be added to this list
+ */
+char **slap_known_controls = NULL;
+
+static char *proxy_authz_extops[] = {
+	LDAP_EXOP_MODIFY_PASSWD,
+	LDAP_EXOP_X_WHO_AM_I,
 	NULL
 };
 
+static struct slap_control control_defs[] = {
+	{ LDAP_CONTROL_ASSERT,
+		SLAP_CTRL_HIDE|SLAP_CTRL_ACCESS, NULL,
+		parseAssert, LDAP_SLIST_ENTRY_INITIALIZER(next) },
+	{ LDAP_CONTROL_PRE_READ,
+		SLAP_CTRL_HIDE|SLAP_CTRL_DELETE|SLAP_CTRL_MODIFY|SLAP_CTRL_RENAME, NULL,
+		parsePreRead, LDAP_SLIST_ENTRY_INITIALIZER(next) },
+	{ LDAP_CONTROL_POST_READ,
+		SLAP_CTRL_HIDE|SLAP_CTRL_ADD|SLAP_CTRL_MODIFY|SLAP_CTRL_RENAME, NULL,
+		parsePostRead, LDAP_SLIST_ENTRY_INITIALIZER(next) },
+ 	{ LDAP_CONTROL_VALUESRETURNFILTER,
+ 		SLAP_CTRL_SEARCH, NULL,
+		parseValuesReturnFilter, LDAP_SLIST_ENTRY_INITIALIZER(next) },
+#ifdef LDAP_CONTROL_PAGEDRESULTS
+	{ LDAP_CONTROL_PAGEDRESULTS,
+		SLAP_CTRL_SEARCH, NULL,
+		parsePagedResults, LDAP_SLIST_ENTRY_INITIALIZER(next) },
+#endif
+#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
+	{ LDAP_CONTROL_X_DOMAIN_SCOPE,
+		SLAP_CTRL_FRONTEND|SLAP_CTRL_SEARCH, NULL,
+		parseDomainScope, LDAP_SLIST_ENTRY_INITIALIZER(next) },
+#endif
+#ifdef LDAP_CONTROL_X_PERMISSIVE_MODIFY
+	{ LDAP_CONTROL_X_PERMISSIVE_MODIFY,
+		SLAP_CTRL_MODIFY, NULL,
+		parsePermissiveModify, LDAP_SLIST_ENTRY_INITIALIZER(next) },
+#endif
+#ifdef LDAP_CONTROL_SUBENTRIES
+	{ LDAP_CONTROL_SUBENTRIES,
+		SLAP_CTRL_SEARCH, NULL,
+		parseSubentries, LDAP_SLIST_ENTRY_INITIALIZER(next) },
+#endif
+	{ LDAP_CONTROL_NOOP,
+		SLAP_CTRL_ACCESS, NULL,
+		parseNoOp, LDAP_SLIST_ENTRY_INITIALIZER(next) },
+	{ LDAP_CONTROL_SYNC,
+		SLAP_CTRL_HIDE|SLAP_CTRL_SEARCH, NULL,
+		parseLDAPsync, LDAP_SLIST_ENTRY_INITIALIZER(next) },
+	{ LDAP_CONTROL_MODIFY_INCREMENT,
+		SLAP_CTRL_HIDE|SLAP_CTRL_MODIFY, NULL,
+		parseModifyIncrement, LDAP_SLIST_ENTRY_INITIALIZER(next) },
+	{ LDAP_CONTROL_MANAGEDSAIT,
+		SLAP_CTRL_ACCESS, NULL,
+		parseManageDSAit, LDAP_SLIST_ENTRY_INITIALIZER(next) },
+	{ LDAP_CONTROL_PROXY_AUTHZ,
+		SLAP_CTRL_FRONTEND|SLAP_CTRL_ACCESS, proxy_authz_extops,
+		parseProxyAuthz, LDAP_SLIST_ENTRY_INITIALIZER(next) },
+	{ NULL, 0, NULL, 0, LDAP_SLIST_ENTRY_INITIALIZER(next) }
+};
+
+/*
+ * Register a supported control.
+ *
+ * This can be called by an OpenLDAP plugin or, indirectly, by a
+ * SLAPI plugin calling slapi_register_supported_control().
+ */
+int
+register_supported_control(const char *controloid,
+	slap_mask_t controlmask,
+	char **controlexops,
+	SLAP_CTRL_PARSE_FN *controlparsefn)
+{
+	struct slap_control *sc;
+	int i;
+
+	if ( controloid == NULL ) {
+		return LDAP_PARAM_ERROR;
+	}
+
+	sc = (struct slap_control *)SLAP_MALLOC( sizeof( *sc ) );
+	if ( sc == NULL ) {
+		return LDAP_NO_MEMORY;
+	}
+	sc->sc_oid = ch_strdup( controloid );
+	sc->sc_mask = controlmask;
+	if ( controlexops != NULL ) {
+		sc->sc_extendedops = ldap_charray_dup( controlexops );
+		if ( sc->sc_extendedops == NULL ) {
+			ch_free( sc );
+			return LDAP_NO_MEMORY;
+		}
+	} else {
+		sc->sc_extendedops = NULL;
+	}
+	sc->sc_parse = controlparsefn;
+
+	/* Update slap_known_controls, too. */
+	if ( slap_known_controls == NULL ) {
+		slap_known_controls = (char **)SLAP_MALLOC( 2 * sizeof(char *) );
+		if ( slap_known_controls == NULL ) {
+			if ( sc->sc_extendedops != NULL ) ldap_charray_free( sc->sc_extendedops );
+			ch_free( sc );
+			return LDAP_NO_MEMORY;
+		}
+		slap_known_controls[0] = ch_strdup( sc->sc_oid );
+		slap_known_controls[1] = NULL;
+	} else {
+		for ( i = 0; slap_known_controls[i] != NULL; i++ )
+			;
+		slap_known_controls = (char **)SLAP_REALLOC( slap_known_controls, (i + 2) * sizeof(char *) );
+		if ( slap_known_controls == NULL ) {
+			if ( sc->sc_extendedops != NULL ) ldap_charray_free( sc->sc_extendedops );
+			ch_free( sc );
+			return LDAP_NO_MEMORY;
+		}
+		slap_known_controls[i++] = ch_strdup( sc->sc_oid );
+		slap_known_controls[i] = NULL;
+	}
+
+	LDAP_SLIST_NEXT( sc, sc_next ) = NULL;
+	LDAP_SLIST_INSERT_HEAD( &controls_list, sc, sc_next );
+
+	return LDAP_SUCCESS;
+}
+
+/*
+ * One-time initialization of internal controls.
+ */
+int
+slap_controls_init( void )
+{
+	int i, rc;
+	struct slap_control *sc;
+
+	rc = LDAP_SUCCESS;
+
+	for ( i = 0; control_defs[i].sc_oid != NULL; i++ ) {
+		rc = register_supported_control( control_defs[i].sc_oid,
+			control_defs[i].sc_mask, control_defs[i].sc_extendedops,
+			control_defs[i].sc_parse );
+		if ( rc != LDAP_SUCCESS )
+			break;
+	}
+
+	return rc;
+}
+
+/*
+ * Free memory associated with list of supported controls.
+ */
+void
+controls_destroy( void )
+{
+	struct slap_control *sc;
+
+	while ( !LDAP_SLIST_EMPTY(&controls_list) ) {
+		sc = LDAP_SLIST_FIRST(&controls_list);
+		LDAP_SLIST_REMOVE_HEAD(&controls_list, sc_next);
+
+		ch_free( sc->sc_oid );
+		if ( sc->sc_extendedops != NULL ) {
+			ldap_charray_free( sc->sc_extendedops );
+		}
+		ch_free( sc );
+	}
+	ldap_charray_free( slap_known_controls );
+}
+
+/*
+ * Format the supportedControl attribute of the root DSE,
+ * detailing which controls are supported by the directory
+ * server.
+ */
+int
+controls_root_dse_info( Entry *e )
+{
+	AttributeDescription *ad_supportedControl
+		= slap_schema.si_ad_supportedControl;
+	struct berval vals[2];
+	struct slap_control *sc;
+
+	vals[1].bv_val = NULL;
+	vals[1].bv_len = 0;
+
+	LDAP_SLIST_FOREACH( sc, &controls_list, sc_next ) {
+		if( sc->sc_mask & SLAP_CTRL_HIDE ) continue;
+
+		vals[0].bv_val = sc->sc_oid;
+		vals[0].bv_len = strlen( sc->sc_oid );
+
+		if ( attr_merge( e, ad_supportedControl, vals, NULL ) ) {
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+/*
+ * Return a list of OIDs and operation masks for supported
+ * controls. Used by SLAPI.
+ */
+int
+get_supported_controls(char ***ctrloidsp,
+	slap_mask_t **ctrlmasks)
+{
+	int i, n;
+	char **oids;
+	slap_mask_t *masks;
+	int rc;
+	struct slap_control *sc;
+
+	n = 0;
+
+	LDAP_SLIST_FOREACH( sc, &controls_list, sc_next ) {
+		n++;
+	}
+
+	if ( n == 0 ) {
+		*ctrloidsp = NULL;
+		*ctrlmasks = NULL;
+		return LDAP_SUCCESS;
+	}
+
+	oids = (char **)SLAP_MALLOC( (n + 1) * sizeof(char *) );
+	if ( oids == NULL ) {
+		return LDAP_NO_MEMORY;
+	}
+	masks = (slap_mask_t *)SLAP_MALLOC( (n + 1) * sizeof(slap_mask_t) );
+	if  ( masks == NULL ) {
+		ch_free( oids );
+		return LDAP_NO_MEMORY;
+	}
+
+	n = 0;
+
+	LDAP_SLIST_FOREACH( sc, &controls_list, sc_next ) {
+		oids[n] = ch_strdup( sc->sc_oid );
+		masks[n] = sc->sc_mask;
+		n++;
+	}
+	oids[n] = NULL;
+	masks[n] = 0;
+
+	*ctrloidsp = oids;
+	*ctrlmasks = masks;
+
+	return LDAP_SUCCESS;
+}
+
+/*
+ * Find a control given its OID.
+ */
+static struct slap_control *
+find_ctrl( const char *oid )
+{
+	struct slap_control *sc;
+
+	LDAP_SLIST_FOREACH( sc, &controls_list, sc_next ) {
+		if ( strcmp( oid, sc->sc_oid ) == 0 ) {
+			return sc;
+		}
+	}
+
+	return NULL;
+}
+
+void slap_free_ctrls(
+	Operation *op,
+	LDAPControl **ctrls
+)
+{
+	int i;
+
+	for (i=0; ctrls[i]; i++) {
+		op->o_tmpfree(ctrls[i], op->o_tmpmemctx );
+	}
+	op->o_tmpfree( ctrls, op->o_tmpmemctx );
+}
+
 int get_ctrls(
-	Connection *conn,
 	Operation *op,
+	SlapReply *rs,
 	int sendres )
 {
 	int nctrls = 0;
@@ -34,104 +357,119 @@ int get_ctrls(
 	ber_len_t len;
 	char *opaque;
 	BerElement *ber = op->o_ber;
-	LDAPControl ***ctrls = &op->o_ctrls;
-	int rc = LDAP_SUCCESS;
-	char *errmsg = NULL;
+	struct slap_control *sc;
+	struct berval bv;
 
 	len = ber_pvt_ber_remaining(ber);
 
 	if( len == 0) {
 		/* no controls */
-		rc = LDAP_SUCCESS;
-		return rc;
+		rs->sr_err = LDAP_SUCCESS;
+		return rs->sr_err;
 	}
 
 	if(( tag = ber_peek_tag( ber, &len )) != LDAP_TAG_CONTROLS ) {
 		if( tag == LBER_ERROR ) {
-			rc = SLAPD_DISCONNECT;
-			errmsg = "unexpected data in PDU";
+			rs->sr_err = SLAPD_DISCONNECT;
+			rs->sr_text = "unexpected data in PDU";
 		}
 
 		goto return_results;
 	}
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-		   "get_ctrls: conn %d\n", conn->c_connid ));
+	LDAP_LOG( OPERATION, ENTRY,
+		"get_ctrls: conn %lu\n", op->o_connid, 0, 0 );
 #else
-	Debug( LDAP_DEBUG_TRACE, "=> get_ctrls\n", 0, 0, 0 );
+	Debug( LDAP_DEBUG_TRACE,
+		"=> get_ctrls\n", 0, 0, 0 );
 #endif
+
 	if( op->o_protocol < LDAP_VERSION3 ) {
-		rc = SLAPD_DISCONNECT;
-		errmsg = "controls require LDAPv3";
+		rs->sr_err = SLAPD_DISCONNECT;
+		rs->sr_text = "controls require LDAPv3";
 		goto return_results;
 	}
 
-	/* set through each element */
-	*ctrls = ch_malloc( 1 * sizeof(LDAPControl *) );
+	/* one for first control, one for termination */
+	op->o_ctrls = op->o_tmpalloc( 2 * sizeof(LDAPControl *), op->o_tmpmemctx );
 
 #if 0
-	if( *ctrls == NULL ) {
-		rc = LDAP_NO_MEMORY;
-		errmsg = "no memory";
+	if( op->ctrls == NULL ) {
+		rs->sr_err = LDAP_NO_MEMORY;
+		rs->sr_text = "no memory";
 		goto return_results;
 	}
 #endif
 
-	*ctrls[nctrls] = NULL;
+	op->o_ctrls[nctrls] = NULL;
 
+	/* step through each element */
 	for( tag = ber_first_element( ber, &len, &opaque );
 		tag != LBER_ERROR;
 		tag = ber_next_element( ber, &len, opaque ) )
 	{
-		LDAPControl *tctrl;
+		LDAPControl *c;
 		LDAPControl **tctrls;
 
-		tctrl = ch_calloc( 1, sizeof(LDAPControl) );
-		tctrl->ldctl_oid = NULL;
-		tctrl->ldctl_value.bv_val = NULL;
+		c = op->o_tmpalloc( sizeof(LDAPControl), op->o_tmpmemctx );
+		memset(c, 0, sizeof(LDAPControl));
 
 		/* allocate pointer space for current controls (nctrls)
 		 * + this control + extra NULL
 		 */
-		tctrls = (tctrl == NULL) ? NULL :
-			ch_realloc(*ctrls, (nctrls+2) * sizeof(LDAPControl *));
+		tctrls = op->o_tmprealloc( op->o_ctrls,
+			(nctrls+2) * sizeof(LDAPControl *), op->o_tmpmemctx );
 
 #if 0
 		if( tctrls == NULL ) {
-			/* one of the above allocation failed */
-
-			if( tctrl != NULL ) {
-				ch_free( tctrl );
-			}
+			ch_free( c );
+			ldap_controls_free(op->o_ctrls);
+			op->o_ctrls = NULL;
 
-			ldap_controls_free(*ctrls);
-			*ctrls = NULL;
-
-			rc = LDAP_NO_MEMORY;
-			errmsg = "no memory";
+			rs->sr_err = LDAP_NO_MEMORY;
+			rs->sr_text = "no memory";
 			goto return_results;
 		}
 #endif
+		op->o_ctrls = tctrls;
 
-		tctrls[nctrls++] = tctrl;
-		tctrls[nctrls] = NULL;
+		op->o_ctrls[nctrls++] = c;
+		op->o_ctrls[nctrls] = NULL;
 
-		tag = ber_scanf( ber, "{a" /*}*/, &tctrl->ldctl_oid );
+		tag = ber_scanf( ber, "{m" /*}*/, &bv );
+		c->ldctl_oid = bv.bv_val;
 
 		if( tag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-				   "get_ctrls: conn %d  get OID failed.\n",
-				   conn->c_connid ));
+			LDAP_LOG( OPERATION, INFO, "get_ctrls: conn %lu get OID failed.\n",
+				op->o_connid, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: get oid failed.\n",
 				0, 0, 0 );
 #endif
-			*ctrls = NULL;
-			ldap_controls_free( tctrls );
-			rc = SLAPD_DISCONNECT;
-			errmsg = "decoding controls error";
+
+			slap_free_ctrls( op, op->o_ctrls );
+			op->o_ctrls = NULL;
+			rs->sr_err = SLAPD_DISCONNECT;
+			rs->sr_text = "decoding controls error";
+			goto return_results;
+
+		} else if( c->ldctl_oid == NULL ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG( OPERATION, INFO,
+				"get_ctrls: conn %lu got emtpy OID.\n",
+				op->o_connid, 0, 0 );
+#else
+			Debug( LDAP_DEBUG_TRACE,
+				"get_ctrls: conn %lu got emtpy OID.\n",
+				op->o_connid, 0, 0 );
+#endif
+
+			slap_free_ctrls( op, op->o_ctrls );
+			op->o_ctrls = NULL;
+			rs->sr_err = LDAP_PROTOCOL_ERROR;
+			rs->sr_text = "OID field is empty";
 			goto return_results;
 		}
 
@@ -143,102 +481,812 @@ int get_ctrls(
 
 			if( tag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-				LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-					   "get_ctrls: conn %d  get crit failed.\n",
-					   conn->c_connid ));
+				LDAP_LOG( OPERATION, INFO, 
+					"get_ctrls: conn %lu get crit failed.\n", 
+					op->o_connid, 0, 0 );
 #else
 				Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: get crit failed.\n",
 					0, 0, 0 );
 #endif
-				*ctrls = NULL;
-				ldap_controls_free( tctrls );
-				rc = SLAPD_DISCONNECT;
-				errmsg = "decoding controls error";
+				slap_free_ctrls( op, op->o_ctrls );
+				op->o_ctrls = NULL;
+				rs->sr_err = SLAPD_DISCONNECT;
+				rs->sr_text = "decoding controls error";
 				goto return_results;
 			}
 
-			tctrl->ldctl_iscritical = (crit != 0);
+			c->ldctl_iscritical = (crit != 0);
 			tag = ber_peek_tag( ber, &len );
 		}
 
-#ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-			   "get_ctrls: conn %d oid=\"%s\" (%scritical)\n",
-			   conn->c_connid, tctrl->ldctl_oid,
-			   tctrl->ldctl_iscritical ? "" : "non" ));
-#else
-		Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: oid=\"%s\" (%scritical)\n",
-			tctrl->ldctl_oid, 
-			tctrl->ldctl_iscritical ? "" : "non",
-			0 );
-#endif
 		if( tag == LBER_OCTETSTRING ) {
-			tag = ber_scanf( ber, "o", &tctrl->ldctl_value );
+			tag = ber_scanf( ber, "m", &c->ldctl_value );
 
 			if( tag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-				LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-					   "get_ctrls: conn %d  get value failed.\n", conn->c_connid ));
+				LDAP_LOG( OPERATION, INFO, "get_ctrls: conn %lu: "
+					"%s (%scritical): get value failed.\n",
+					op->o_connid, c->ldctl_oid,
+					c->ldctl_iscritical ? "" : "non" );
 #else
-				Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: get value failed.\n",
-					0, 0, 0 );
+				Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: conn %lu: "
+					"%s (%scritical): get value failed.\n",
+					op->o_connid, c->ldctl_oid,
+					c->ldctl_iscritical ? "" : "non" );
 #endif
-				*ctrls = NULL;
-				ldap_controls_free( tctrls );
-				rc = SLAPD_DISCONNECT;
-				errmsg = "decoding controls error";
+				slap_free_ctrls( op, op->o_ctrls );
+				op->o_ctrls = NULL;
+				rs->sr_err = SLAPD_DISCONNECT;
+				rs->sr_text = "decoding controls error";
 				goto return_results;
 			}
 		}
 
-		if( tctrl->ldctl_iscritical &&
-			!charray_inlist( supportedControls, tctrl->ldctl_oid ) )
-		{
-			rc = LDAP_UNAVAILABLE_CRITICAL_EXTENSION;
-			errmsg = "critical extension is unavailable ";
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, INFO, 
+			"get_ctrls: conn %lu oid=\"%s\" (%scritical)\n",
+			op->o_connid, c->ldctl_oid, c->ldctl_iscritical ? "" : "non" );
+#else
+		Debug( LDAP_DEBUG_TRACE,
+			"=> get_ctrls: oid=\"%s\" (%scritical)\n",
+			c->ldctl_oid, c->ldctl_iscritical ? "" : "non", 0 );
+#endif
+
+		sc = find_ctrl( c->ldctl_oid );
+		if( sc != NULL ) {
+			/* recognized control */
+			slap_mask_t tagmask;
+			switch( op->o_tag ) {
+			case LDAP_REQ_ADD:
+				tagmask = SLAP_CTRL_ADD;
+				break;
+			case LDAP_REQ_BIND:
+				tagmask = SLAP_CTRL_BIND;
+				break;
+			case LDAP_REQ_COMPARE:
+				tagmask = SLAP_CTRL_COMPARE;
+				break;
+			case LDAP_REQ_DELETE:
+				tagmask = SLAP_CTRL_DELETE;
+				break;
+			case LDAP_REQ_MODIFY:
+				tagmask = SLAP_CTRL_MODIFY;
+				break;
+			case LDAP_REQ_RENAME:
+				tagmask = SLAP_CTRL_RENAME;
+				break;
+			case LDAP_REQ_SEARCH:
+				tagmask = SLAP_CTRL_SEARCH;
+				break;
+			case LDAP_REQ_UNBIND:
+				tagmask = SLAP_CTRL_UNBIND;
+				break;
+			case LDAP_REQ_ABANDON:
+				tagmask = SLAP_CTRL_ABANDON;
+				break;
+			case LDAP_REQ_EXTENDED:
+				tagmask=~0L;
+				assert( op->ore_reqoid.bv_val != NULL );
+				if( sc->sc_extendedops != NULL ) {
+					int i;
+					for( i=0; sc->sc_extendedops[i] != NULL; i++ ) {
+						if( strcmp( op->ore_reqoid.bv_val, sc->sc_extendedops[i] )
+							== 0 )
+						{
+							tagmask=0L;
+							break;
+						}
+					}
+				}
+				break;
+			default:
+				rs->sr_err = LDAP_OTHER;
+				rs->sr_text = "controls internal error";
+				goto return_results;
+			}
+
+			if (( sc->sc_mask & tagmask ) == tagmask ) {
+				/* available extension */
+
+				if( !sc->sc_parse ) {
+					rs->sr_err = LDAP_OTHER;
+					rs->sr_text = "not yet implemented";
+					goto return_results;
+				}
+
+				rs->sr_err = sc->sc_parse( op, rs, c );
+
+				if( rs->sr_err != LDAP_SUCCESS ) goto return_results;
+
+				if ( sc->sc_mask & SLAP_CTRL_FRONTEND ) {
+					/* kludge to disable backend_control() check */
+					c->ldctl_iscritical = 0;
+
+				} else if ( tagmask == SLAP_CTRL_SEARCH &&
+					sc->sc_mask & SLAP_CTRL_FRONTEND_SEARCH )
+				{
+					/* kludge to disable backend_control() check */
+					c->ldctl_iscritical = 0;
+				}
+
+			} else if( c->ldctl_iscritical ) {
+				/* unavailable CRITICAL control */
+				rs->sr_err = LDAP_UNAVAILABLE_CRITICAL_EXTENSION;
+				rs->sr_text = "critical extension is unavailable";
+				goto return_results;
+			}
+
+		} else if( c->ldctl_iscritical ) {
+			/* unrecognized CRITICAL control */
+			rs->sr_err = LDAP_UNAVAILABLE_CRITICAL_EXTENSION;
+			rs->sr_text = "critical extension is not recognized";
 			goto return_results;
 		}
-
-		*ctrls = tctrls;
 	}
 
 return_results:
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_RESULTS,
-		   "get_ctrls: conn %d	%d %d %s\n",
-		   conn->c_connid, nctrls, rc, errmsg ? errmsg : "" ));
+	LDAP_LOG( OPERATION, RESULTS, 
+		"get_ctrls: n=%d rc=%d err=\"%s\"\n",
+		nctrls, rs->sr_err, rs->sr_text ? rs->sr_text : "" );
 #else
-	Debug( LDAP_DEBUG_TRACE, "<= get_ctrls: %d %d %s\n",
-		nctrls, rc, errmsg ? errmsg : "");
+	Debug( LDAP_DEBUG_TRACE,
+		"<= get_ctrls: n=%d rc=%d err=\"%s\"\n",
+		nctrls, rs->sr_err, rs->sr_text ? rs->sr_text : "");
 #endif
 
-	if( sendres && rc != LDAP_SUCCESS ) {
-		if( rc == SLAPD_DISCONNECT ) {
-			send_ldap_disconnect( conn, op, LDAP_PROTOCOL_ERROR, errmsg );
+	if( sendres && rs->sr_err != LDAP_SUCCESS ) {
+		if( rs->sr_err == SLAPD_DISCONNECT ) {
+			rs->sr_err = LDAP_PROTOCOL_ERROR;
+			send_ldap_disconnect( op, rs );
+			rs->sr_err = SLAPD_DISCONNECT;
 		} else {
-			send_ldap_result( conn, op, rc,
-				NULL, errmsg, NULL, NULL );
+			send_ldap_result( op, rs );
 		}
 	}
 
-	return rc;
+	return rs->sr_err;
 }
 
+static int parseModifyIncrement (
+	Operation *op,
+	SlapReply *rs,
+	LDAPControl *ctrl )
+{
+#if 0
+	if ( op->o_parseModifyIncrement != SLAP_NO_CONTROL ) {
+		rs->sr_text = "modifyIncrement control specified multiple times";
+		return LDAP_PROTOCOL_ERROR;
+	}
+#endif
+
+	if ( ctrl->ldctl_value.bv_len ) {
+		rs->sr_text = "modifyIncrement control value not empty";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+#if 0
+	op->o_parseModifyIncrement = ctrl->ldctl_iscritical
+		? SLAP_CRITICAL_CONTROL
+		: SLAP_NONCRITICAL_CONTROL;
+#endif
+
+	return LDAP_SUCCESS;
+}
 
-int get_manageDSAit( Operation *op )
+static int parseManageDSAit (
+	Operation *op,
+	SlapReply *rs,
+	LDAPControl *ctrl )
 {
-	int i;
-	if( op == NULL || op->o_ctrls == NULL ) {
-		return 0;
+	if ( op->o_managedsait != SLAP_NO_CONTROL ) {
+		rs->sr_text = "manageDSAit control specified multiple times";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	if ( ctrl->ldctl_value.bv_len ) {
+		rs->sr_text = "manageDSAit control value not empty";
+		return LDAP_PROTOCOL_ERROR;
 	}
 
-	for( i=0; op->o_ctrls[i] != NULL; i++ ) {
-		if( strcmp( LDAP_CONTROL_MANAGEDSAIT, op->o_ctrls[i]->ldctl_oid )
-			== 0 )
-		{
-			return 1;
+	op->o_managedsait = ctrl->ldctl_iscritical
+		? SLAP_CRITICAL_CONTROL
+		: SLAP_NONCRITICAL_CONTROL;
+
+	return LDAP_SUCCESS;
+}
+
+static int parseProxyAuthz (
+	Operation *op,
+	SlapReply *rs,
+	LDAPControl *ctrl )
+{
+	int rc;
+	struct berval dn = { 0, NULL };
+
+	if ( op->o_proxy_authz != SLAP_NO_CONTROL ) {
+		rs->sr_text = "proxy authorization control specified multiple times";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	op->o_proxy_authz = ctrl->ldctl_iscritical
+		? SLAP_CRITICAL_CONTROL
+		: SLAP_NONCRITICAL_CONTROL;
+
+#ifdef NEW_LOGGING
+	LDAP_LOG( OPERATION, ARGS, 
+		"parseProxyAuthz: conn %lu authzid=\"%s\"\n", 
+		op->o_connid,
+		ctrl->ldctl_value.bv_len ?  ctrl->ldctl_value.bv_val : "anonymous",
+		0 );
+#else
+	Debug( LDAP_DEBUG_ARGS,
+		"parseProxyAuthz: conn %lu authzid=\"%s\"\n", 
+		op->o_connid,
+		ctrl->ldctl_value.bv_len ?  ctrl->ldctl_value.bv_val : "anonymous",
+		0 );
+#endif
+
+	if( ctrl->ldctl_value.bv_len == 0 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, RESULTS, 
+			"parseProxyAuthz: conn=%lu anonymous\n", 
+			op->o_connid, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_TRACE,
+			"parseProxyAuthz: conn=%lu anonymous\n", 
+			op->o_connid, 0, 0 );
+#endif
+
+		/* anonymous */
+		free( op->o_dn.bv_val );
+		op->o_dn.bv_len = 0;
+		op->o_dn.bv_val = ch_strdup( "" );
+
+		free( op->o_ndn.bv_val );
+		op->o_ndn.bv_len = 0;
+		op->o_ndn.bv_val = ch_strdup( "" );
+
+		return LDAP_SUCCESS;
+	}
+
+	rc = slap_sasl_getdn( op->o_conn, op,
+		ctrl->ldctl_value.bv_val, ctrl->ldctl_value.bv_len,
+		NULL, &dn, SLAP_GETDN_AUTHZID );
+
+	if( rc != LDAP_SUCCESS || !dn.bv_len ) {
+		if ( dn.bv_val ) {
+			ch_free( dn.bv_val );
 		}
+		rs->sr_text = "authzId mapping failed";
+		return LDAP_PROXY_AUTHZ_FAILURE;
 	}
 
-	return 0;
+#ifdef NEW_LOGGING
+	LDAP_LOG( OPERATION, RESULTS, 
+		"parseProxyAuthz: conn=%lu \"%s\"\n", 
+		op->o_connid,
+		dn.bv_len ? dn.bv_val : "(NULL)", 0 );
+#else
+	Debug( LDAP_DEBUG_TRACE,
+		"parseProxyAuthz: conn=%lu \"%s\"\n", 
+		op->o_connid,
+		dn.bv_len ? dn.bv_val : "(NULL)", 0 );
+#endif
+
+	rc = slap_sasl_authorized( op, &op->o_ndn, &dn );
+
+	if( rc ) {
+		ch_free( dn.bv_val );
+		rs->sr_text = "not authorized to assume identity";
+		return LDAP_PROXY_AUTHZ_FAILURE;
+	}
+
+	ch_free( op->o_dn.bv_val );
+	ch_free( op->o_ndn.bv_val );
+
+	op->o_dn.bv_val = NULL;
+	op->o_ndn = dn;
+
+	/*
+	 * NOTE: since slap_sasl_getdn() returns a normalized dn,
+	 * from now on op->o_dn is normalized
+	 */
+	ber_dupbv( &op->o_dn, &dn );
+
+	return LDAP_SUCCESS;
+}
+
+static int parseNoOp (
+	Operation *op,
+	SlapReply *rs,
+	LDAPControl *ctrl )
+{
+	if ( op->o_noop != SLAP_NO_CONTROL ) {
+		rs->sr_text = "noop control specified multiple times";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	if ( ctrl->ldctl_value.bv_len ) {
+		rs->sr_text = "noop control value not empty";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	op->o_noop = ctrl->ldctl_iscritical
+		? SLAP_CRITICAL_CONTROL
+		: SLAP_NONCRITICAL_CONTROL;
+
+	return LDAP_SUCCESS;
+}
+
+#ifdef LDAP_CONTROL_PAGEDRESULTS
+static int parsePagedResults (
+	Operation *op,
+	SlapReply *rs,
+	LDAPControl *ctrl )
+{
+	ber_tag_t tag;
+	ber_int_t size;
+	BerElement *ber;
+	struct berval cookie = { 0, NULL };
+
+	if ( op->o_pagedresults != SLAP_NO_CONTROL ) {
+		rs->sr_text = "paged results control specified multiple times";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	if ( ctrl->ldctl_value.bv_len == 0 ) {
+		rs->sr_text = "paged results control value is empty (or absent)";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	/* Parse the control value
+	 *	realSearchControlValue ::= SEQUENCE {
+	 *		size	INTEGER (0..maxInt),
+	 *				-- requested page size from client
+	 *				-- result set size estimate from server
+	 *		cookie	OCTET STRING
+	 * }
+	 */
+	ber = ber_init( &ctrl->ldctl_value );
+	if( ber == NULL ) {
+		rs->sr_text = "internal error";
+		return LDAP_OTHER;
+	}
+
+	tag = ber_scanf( ber, "{im}", &size, &cookie );
+	(void) ber_free( ber, 1 );
+
+	if( tag == LBER_ERROR ) {
+		rs->sr_text = "paged results control could not be decoded";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	if( size < 0 ) {
+		rs->sr_text = "paged results control size invalid";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	if( cookie.bv_len ) {
+		PagedResultsCookie reqcookie;
+		if( cookie.bv_len != sizeof( reqcookie ) ) {
+			/* bad cookie */
+			rs->sr_text = "paged results cookie is invalid";
+			return LDAP_PROTOCOL_ERROR;
+		}
+
+		AC_MEMCPY( &reqcookie, cookie.bv_val, sizeof( reqcookie ));
+
+		if( reqcookie > op->o_pagedresults_state.ps_cookie ) {
+			/* bad cookie */
+			rs->sr_text = "paged results cookie is invalid";
+			return LDAP_PROTOCOL_ERROR;
+
+		} else if( reqcookie < op->o_pagedresults_state.ps_cookie ) {
+			rs->sr_text = "paged results cookie is invalid or old";
+			return LDAP_UNWILLING_TO_PERFORM;
+		}
+	} else {
+		/* Initial request.  Initialize state. */
+		op->o_pagedresults_state.ps_cookie = 0;
+		op->o_pagedresults_state.ps_id = NOID;
+	}
+
+	op->o_pagedresults_size = size;
+
+	op->o_pagedresults = ctrl->ldctl_iscritical
+		? SLAP_CRITICAL_CONTROL
+		: SLAP_NONCRITICAL_CONTROL;
+
+	return LDAP_SUCCESS;
+}
+#endif
+
+static int parseAssert (
+	Operation *op,
+	SlapReply *rs,
+	LDAPControl *ctrl )
+{
+	BerElement	*ber;
+	struct berval	fstr = { 0, NULL };
+	const char *err_msg = "";
+
+	if ( op->o_assert != SLAP_NO_CONTROL ) {
+		rs->sr_text = "assert control specified multiple times";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	if ( ctrl->ldctl_value.bv_len == 0 ) {
+		rs->sr_text = "assert control value is empty (or absent)";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	ber = ber_init( &(ctrl->ldctl_value) );
+	if (ber == NULL) {
+		rs->sr_text = "assert control: internal error";
+		return LDAP_OTHER;
+	}
+	
+	rs->sr_err = get_filter( op, ber, &(op->o_assertion), &rs->sr_text);
+
+	if( rs->sr_err != LDAP_SUCCESS ) {
+		if( rs->sr_err == SLAPD_DISCONNECT ) {
+			rs->sr_err = LDAP_PROTOCOL_ERROR;
+			send_ldap_disconnect( op, rs );
+			rs->sr_err = SLAPD_DISCONNECT;
+		} else {
+			send_ldap_result( op, rs );
+		}
+		if( op->o_assertion != NULL ) {
+			filter_free_x( op, op->o_assertion );
+		}
+		return rs->sr_err;
+	}
+
+#ifdef LDAP_DEBUG
+	filter2bv_x( op, op->o_assertion, &fstr );
+
+#ifdef NEW_LOGGING
+	LDAP_LOG( OPERATION, ARGS, 
+		"parseAssert: conn %ld assert: %s\n", 
+		op->o_connid, fstr.bv_len ? fstr.bv_val : "empty" , 0 );
+#else
+	Debug( LDAP_DEBUG_ARGS, "parseAssert: conn %ld assert: %s\n",
+		op->o_connid, fstr.bv_len ? fstr.bv_val : "empty" , 0 );
+#endif
+	op->o_tmpfree( fstr.bv_val, op->o_tmpmemctx );
+#endif
+
+	op->o_assert = ctrl->ldctl_iscritical
+		? SLAP_CRITICAL_CONTROL
+		: SLAP_NONCRITICAL_CONTROL;
+
+	rs->sr_err = LDAP_SUCCESS;
+	return LDAP_SUCCESS;
+}
+
+static int parsePreRead (
+	Operation *op,
+	SlapReply *rs,
+	LDAPControl *ctrl )
+{
+	ber_len_t siz, off, i;
+	AttributeName *an = NULL;
+	BerElement	*ber;
+
+	if ( op->o_preread != SLAP_NO_CONTROL ) {
+		rs->sr_text = "preread control specified multiple times";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	if ( ctrl->ldctl_value.bv_len == 0 ) {
+		rs->sr_text = "preread control value is empty (or absent)";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	ber = ber_init( &(ctrl->ldctl_value) );
+	if (ber == NULL) {
+		rs->sr_text = "preread control: internal error";
+		return LDAP_OTHER;
+	}
+
+	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;
+	}
+
+	for( i=0; i<siz; i++ ) {
+		const char *dummy;
+		an[i].an_desc = NULL;
+		an[i].an_oc = NULL;
+		slap_bv2ad( &an[i].an_name, &an[i].an_desc, &dummy );
+	}
+
+	op->o_preread = ctrl->ldctl_iscritical
+		? SLAP_CRITICAL_CONTROL
+		: SLAP_NONCRITICAL_CONTROL;
+
+	op->o_preread_attrs = an;
+
+	rs->sr_err = LDAP_SUCCESS;
+	return LDAP_SUCCESS;
+}
+
+static int parsePostRead (
+	Operation *op,
+	SlapReply *rs,
+	LDAPControl *ctrl )
+{
+	ber_len_t siz, off, i;
+	AttributeName *an = NULL;
+	BerElement	*ber;
+
+	if ( op->o_postread != SLAP_NO_CONTROL ) {
+		rs->sr_text = "postread control specified multiple times";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	if ( ctrl->ldctl_value.bv_len == 0 ) {
+		rs->sr_text = "postread control value is empty (or absent)";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	ber = ber_init( &(ctrl->ldctl_value) );
+	if (ber == NULL) {
+		rs->sr_text = "postread control: internal error";
+		return LDAP_OTHER;
+	}
+
+	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;
+	}
+
+	for( i=0; i<siz; i++ ) {
+		const char *dummy;
+		an[i].an_desc = NULL;
+		an[i].an_oc = NULL;
+		slap_bv2ad( &an[i].an_name, &an[i].an_desc, &dummy );
+	}
+
+	op->o_postread = ctrl->ldctl_iscritical
+		? SLAP_CRITICAL_CONTROL
+		: SLAP_NONCRITICAL_CONTROL;
+
+	op->o_postread_attrs = an;
+
+	rs->sr_err = LDAP_SUCCESS;
+	return LDAP_SUCCESS;
+}
+
+int parseValuesReturnFilter (
+	Operation *op,
+	SlapReply *rs,
+	LDAPControl *ctrl )
+{
+	BerElement	*ber;
+	struct berval	fstr = { 0, NULL };
+	const char *err_msg = "";
+
+	if ( op->o_valuesreturnfilter != SLAP_NO_CONTROL ) {
+		rs->sr_text = "valuesReturnFilter control specified multiple times";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	if ( ctrl->ldctl_value.bv_len == 0 ) {
+		rs->sr_text = "valuesReturnFilter control value is empty (or absent)";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	ber = ber_init( &(ctrl->ldctl_value) );
+	if (ber == NULL) {
+		rs->sr_text = "internal error";
+		return LDAP_OTHER;
+	}
+	
+	rs->sr_err = get_vrFilter( op, ber, &(op->o_vrFilter), &rs->sr_text);
+
+	if( rs->sr_err != LDAP_SUCCESS ) {
+		if( rs->sr_err == SLAPD_DISCONNECT ) {
+			rs->sr_err = LDAP_PROTOCOL_ERROR;
+			send_ldap_disconnect( op, rs );
+			rs->sr_err = SLAPD_DISCONNECT;
+		} else {
+			send_ldap_result( op, rs );
+		}
+		if( op->o_vrFilter != NULL) vrFilter_free( op, op->o_vrFilter ); 
+	}
+#ifdef LDAP_DEBUG
+	else {
+		vrFilter2bv( op, op->o_vrFilter, &fstr );
+	}
+
+#ifdef NEW_LOGGING
+	LDAP_LOG( OPERATION, ARGS, 
+		"parseValuesReturnFilter: conn %d	vrFilter: %s\n", 
+		op->o_connid, fstr.bv_len ? fstr.bv_val : "empty" , 0 );
+#else
+	Debug( LDAP_DEBUG_ARGS, "	vrFilter: %s\n",
+		fstr.bv_len ? fstr.bv_val : "empty", 0, 0 );
+#endif
+	op->o_tmpfree( fstr.bv_val, op->o_tmpmemctx );
+#endif
+
+	op->o_valuesreturnfilter = ctrl->ldctl_iscritical
+		? SLAP_CRITICAL_CONTROL
+		: SLAP_NONCRITICAL_CONTROL;
+
+	rs->sr_err = LDAP_SUCCESS;
+	return LDAP_SUCCESS;
+}
+
+#ifdef LDAP_CONTROL_SUBENTRIES
+static int parseSubentries (
+	Operation *op,
+	SlapReply *rs,
+	LDAPControl *ctrl )
+{
+	if ( op->o_subentries != SLAP_NO_CONTROL ) {
+		rs->sr_text = "subentries control specified multiple times";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	/* FIXME: should use BER library */
+	if( ( ctrl->ldctl_value.bv_len != 3 )
+		&& ( ctrl->ldctl_value.bv_val[0] != 0x01 )
+		&& ( ctrl->ldctl_value.bv_val[1] != 0x01 ))
+	{
+		rs->sr_text = "subentries control value encoding is bogus";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	op->o_subentries = ctrl->ldctl_iscritical
+		? SLAP_CRITICAL_CONTROL
+		: SLAP_NONCRITICAL_CONTROL;
+
+	op->o_subentries_visibility = (ctrl->ldctl_value.bv_val[2] != 0x00);
+
+	return LDAP_SUCCESS;
+}
+#endif
+
+#ifdef LDAP_CONTROL_X_PERMISSIVE_MODIFY
+static int parsePermissiveModify (
+	Operation *op,
+	SlapReply *rs,
+	LDAPControl *ctrl )
+{
+	if ( op->o_permissive_modify != SLAP_NO_CONTROL ) {
+		rs->sr_text = "permissiveModify control specified multiple times";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	if ( ctrl->ldctl_value.bv_len ) {
+		rs->sr_text = "permissiveModify control value not empty";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	op->o_permissive_modify = ctrl->ldctl_iscritical
+		? SLAP_CRITICAL_CONTROL
+		: SLAP_NONCRITICAL_CONTROL;
+
+	return LDAP_SUCCESS;
+}
+#endif
+
+#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
+static int parseDomainScope (
+	Operation *op,
+	SlapReply *rs,
+	LDAPControl *ctrl )
+{
+	if ( op->o_domain_scope != SLAP_NO_CONTROL ) {
+		rs->sr_text = "domainScope control specified multiple times";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	if ( ctrl->ldctl_value.bv_len ) {
+		rs->sr_text = "domainScope control value not empty";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	op->o_domain_scope = ctrl->ldctl_iscritical
+		? SLAP_CRITICAL_CONTROL
+		: SLAP_NONCRITICAL_CONTROL;
+
+	return LDAP_SUCCESS;
+}
+#endif
+
+static int parseLDAPsync (
+	Operation *op,
+	SlapReply *rs,
+	LDAPControl *ctrl )
+{
+	ber_tag_t tag;
+	BerElement *ber;
+	ber_int_t mode;
+	ber_len_t len;
+	struct slap_session_entry *se;
+
+	if ( op->o_sync != SLAP_NO_CONTROL ) {
+		rs->sr_text = "LDAP Sync control specified multiple times";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	if ( ctrl->ldctl_value.bv_len == 0 ) {
+		rs->sr_text = "LDAP Sync control value is empty (or absent)";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	/* Parse the control value
+	 *      syncRequestValue ::= SEQUENCE {
+	 *              mode   ENUMERATED {
+	 *                      -- 0 unused
+	 *                      refreshOnly		(1),
+	 *                      -- 2 reserved
+	 *                      refreshAndPersist	(3)
+	 *              },
+	 *              cookie  syncCookie OPTIONAL
+	 *      }
+	 */
+
+	ber = ber_init( &ctrl->ldctl_value );
+	if( ber == NULL ) {
+		rs->sr_text = "internal error";
+		return LDAP_OTHER;
+	}
+
+	if ( (tag = ber_scanf( ber, "{i" /*}*/, &mode )) == LBER_ERROR ) {
+		rs->sr_text = "LDAP Sync control : mode decoding error";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	switch( mode ) {
+	case LDAP_SYNC_REFRESH_ONLY:
+		mode = SLAP_SYNC_REFRESH;
+		break;
+	case LDAP_SYNC_REFRESH_AND_PERSIST:
+		mode = SLAP_SYNC_REFRESH_AND_PERSIST;
+		break;
+	default:
+		rs->sr_text = "LDAP Sync control : unknown update mode";
+		return LDAP_PROTOCOL_ERROR;
+	}
+
+	tag = ber_peek_tag( ber, &len );
+
+	if ( tag == LDAP_TAG_SYNC_COOKIE ) {
+		struct berval tmp_bv;	
+		if (( ber_scanf( ber, /*{*/ "o", &tmp_bv )) == LBER_ERROR ) {
+			rs->sr_text = "LDAP Sync control : cookie decoding error";
+			return LDAP_PROTOCOL_ERROR;
+		}
+		ber_bvarray_add( &op->o_sync_state.octet_str, &tmp_bv );
+		slap_parse_sync_cookie( &op->o_sync_state );
+	}
+	if ( tag == LDAP_TAG_RELOAD_HINT ) {
+		if (( ber_scanf( ber, /*{*/ "b", &op->o_sync_rhint )) == LBER_ERROR ) {
+			rs->sr_text = "LDAP Sync control : rhint decoding error";
+			return LDAP_PROTOCOL_ERROR;
+		}
+	}
+	if (( ber_scanf( ber, /*{*/ "}")) == LBER_ERROR ) {
+			rs->sr_text = "LDAP Sync control : decoding error";
+			return LDAP_PROTOCOL_ERROR;
+	}
+
+	(void) ber_free( ber, 1 );
+
+	op->o_sync_mode = (char) mode;
+
+	op->o_sync = ctrl->ldctl_iscritical
+		? SLAP_CRITICAL_CONTROL
+		: SLAP_NONCRITICAL_CONTROL;
+
+	return LDAP_SUCCESS;
 }