X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsaslauthz.c;h=dca9a0eb15c37e2f116a571c8dd266b9a7e239f3;hb=f3648ea812ea7327e88217cdeb8def360aa012ad;hp=a8d0871c02833fea058b709d9e0c0f4e5383b01a;hpb=0a31400d639f58d251888e41003cbbc8c7bfb1dc;p=openldap

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index a8d0871c02..dca9a0eb15 100644
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -1,13 +1,17 @@
-/*
- * Copyright (c) 2000, Mark Adamson, Carnegie Mellon.  All rights reserved.
- * This software is not subject to any license of Carnegie Mellon University.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Redistribution and use in source and binary forms are permitted without 
- * restriction or fee of any kind as long as this notice is preserved.
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Portions Copyright 2000 Mark Adamson, Carnegie Mellon.
+ * All rights reserved.
  *
- * The name "Carnegie Mellon" must not be used to endorse or promote
- * products derived from this software without prior written permission.
+ * 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"
@@ -19,449 +23,579 @@
 
 #include "slap.h"
 
-#ifdef HAVE_CYRUS_SASL
 #include <limits.h>
-#include <sasl.h>
+
 #include <ldap_pvt.h>
-#endif
 
-/* URI format: ldap://<host>/<base>[?[<attrs>][?[<scope>][?[<filter>]]]] */
+#define SASLREGEX_REPLACE 10
 
-static int slap_parseURI( char *uri,
-	struct berval *searchbase, int *scope, Filter **filter )
-{
-	char *start, *end;
-	struct berval bv;
-	int rc;
+#define LDAP_X_SCOPE_EXACT	((ber_int_t) 0x0010)
+#define LDAP_X_SCOPE_REGEX	((ber_int_t) 0x0020)
+#define LDAP_X_SCOPE_CHILDREN	((ber_int_t) 0x0030)
+#define LDAP_X_SCOPE_SUBTREE	((ber_int_t) 0x0040)
+#define LDAP_X_SCOPE_ONELEVEL	((ber_int_t) 0x0050)
 
+/*
+ * IDs in DNauthzid form can now have a type specifier, that
+ * influences how they are used in related operations.
+ *
+ * syntax: dn[.{exact|regex}]:<val>
+ *
+ * dn.exact:	the value must pass normalization and is used 
+ *		in exact DN match.
+ * dn.regex:	the value is treated as a regular expression 
+ *		in matching DN values in saslAuthz{To|From}
+ *		attributes.
+ * dn:		for backwards compatibility reasons, the value 
+ *		is treated as a regular expression, and thus 
+ *		it is not normalized nor validated; it is used
+ *		in exact or regex comparisons based on the 
+ *		context.
+ *
+ * IDs in DNauthzid form can now have a type specifier, that
+ * influences how they are used in related operations.
+ *
+ * syntax: u[.mech[/realm]]:<val>
+ * 
+ * where mech is a SIMPLE, AUTHZ, or a SASL mechanism name
+ * and realm is mechanism specific realm (separate to those
+ * which are representable as part of the principal).
+ */
 
-	assert( uri != NULL );
-	searchbase->bv_val = NULL;
-	searchbase->bv_len = 0;
-	*scope = -1;
-	*filter = NULL;
+typedef struct sasl_regexp {
+  char *sr_match;						/* regexp match pattern */
+  char *sr_replace; 					/* regexp replace pattern */
+  regex_t sr_workspace;					/* workspace for regexp engine */
+  int sr_offset[SASLREGEX_REPLACE+2];	/* offsets of $1,$2... in *replace */
+} SaslRegexp_t;
 
-#ifdef NEW_LOGGING
-	LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-		"slap_parseURI: parsing %s\n", uri ));
-#else
-	Debug( LDAP_DEBUG_TRACE, "slap_parseURI: parsing %s\n", uri, 0, 0 );
-#endif
+static int nSaslRegexp = 0;
+static SaslRegexp_t *SaslRegexp = NULL;
 
-	/* If it does not look like a URI, assume it is a DN */
-	if( !strncasecmp( uri, "dn:", sizeof("dn:")-1 ) ) {
-		uri += sizeof("dn:")-1;
-		uri += strspn( uri, " " );
-		bv.bv_val = uri;
-		/* FIXME: if dnNormalize actually uses input bv_len we
-		 * will have to make this right.
-		 */
-is_dn:		bv.bv_len = 1;
-		rc = dnNormalize2( NULL, &bv, searchbase );
-		if (rc == LDAP_SUCCESS) {
-			*scope = LDAP_SCOPE_BASE;
-		}
-		return( rc );
-	}
+/* What SASL proxy authorization policies are allowed? */
+#define	SASL_AUTHZ_NONE	0x00
+#define	SASL_AUTHZ_FROM	0x01
+#define	SASL_AUTHZ_TO	0x02
+#define SASL_AUTHZ_AND	0x10
 
-	/* FIXME: should use ldap_url_parse() */
-	if( strncasecmp( uri, "ldap://", sizeof("ldap://")-1 ) ) {
-		bv.bv_val = uri;
-		goto is_dn;
+static int authz_policy = SASL_AUTHZ_NONE;
+
+int slap_sasl_setpolicy( const char *arg )
+{
+	int rc = LDAP_SUCCESS;
+
+	if ( strcasecmp( arg, "none" ) == 0 ) {
+		authz_policy = SASL_AUTHZ_NONE;
+	} else if ( strcasecmp( arg, "from" ) == 0 ) {
+		authz_policy = SASL_AUTHZ_FROM;
+	} else if ( strcasecmp( arg, "to" ) == 0 ) {
+		authz_policy = SASL_AUTHZ_TO;
+	} else if ( strcasecmp( arg, "both" ) == 0 || strcasecmp( arg, "any" ) == 0 ) {
+		authz_policy = SASL_AUTHZ_FROM | SASL_AUTHZ_TO;
+	} else if ( strcasecmp( arg, "all" ) == 0 ) {
+		authz_policy = SASL_AUTHZ_FROM | SASL_AUTHZ_TO | SASL_AUTHZ_AND;
+	} else {
+		rc = LDAP_OTHER;
 	}
+	return rc;
+}
 
-	end = strchr( uri + (sizeof("ldap://")-1), '/' );
-	if ( end == NULL )
-		return( LDAP_PROTOCOL_ERROR );
+int slap_parse_user( struct berval *id, struct berval *user,
+		struct berval *realm, struct berval *mech )
+{
+	char	u;
+	
+	assert( id );
+	assert( id->bv_val );
+	assert( user );
+	assert( realm );
+	assert( mech );
 
-	/* could check the hostname here */
+	u = id->bv_val[ 0 ];
+	
+	if ( u != 'u' && u != 'U' ) {
+		/* called with something other than u: */
+		return LDAP_PROTOCOL_ERROR;
+	}
 
-	/* Grab the searchbase */
-	start = end+1;
-	end = strchr( start, '?' );
-	bv.bv_val = start;
-	if( end == NULL ) {
-		bv.bv_len = 1;
-		return dnNormalize2( NULL, &bv, searchbase );
-	}
-	*end = '\0';
-	bv.bv_len = end - start;
-	rc = dnNormalize2( NULL, &bv, searchbase );
-	*end = '?';
-	if (rc != LDAP_SUCCESS)
-		return( rc );
-
-	/* Skip the attrs */
-	start = end+1;
-	end = strchr( start, '?' );
-	if( end == NULL ) {
-		return( LDAP_SUCCESS );
+	/* uauthzid form:
+	 *		u[.mech[/realm]]:user
+	 */
+	
+	user->bv_val = strchr( id->bv_val, ':' );
+	if ( user->bv_val == NULL ) {
+		return LDAP_PROTOCOL_ERROR;
 	}
+	user->bv_val[ 0 ] = '\0';
+	user->bv_val++;
+	user->bv_len = id->bv_len - ( user->bv_val - id->bv_val );
+
+	mech->bv_val = strchr( id->bv_val, '.' );
+	if ( mech->bv_val != NULL ) {
+		mech->bv_val[ 0 ] = '\0';
+		mech->bv_val++;
+
+		realm->bv_val = strchr( mech->bv_val, '/' );
+
+		if ( realm->bv_val ) {
+			realm->bv_val[ 0 ] = '\0';
+			realm->bv_val++;
+			mech->bv_len = realm->bv_val - mech->bv_val - 1;
+			realm->bv_len = user->bv_val - realm->bv_val - 1;
+		} else {
+			mech->bv_len = user->bv_val - mech->bv_val - 1;
+		}
 
-	/* Grab the scope */
-	start = end+1;
-	if( !strncasecmp( start, "base?", sizeof("base?")-1 )) {
-		*scope = LDAP_SCOPE_BASE;
-		start += sizeof("base?")-1;
+	} else {
+		realm->bv_val = NULL;
 	}
-	else if( !strncasecmp( start, "one?", sizeof("one?")-1 )) {
-		*scope = LDAP_SCOPE_ONELEVEL;
-		start += sizeof("one?")-1;
+
+	if ( id->bv_val[ 1 ] != '\0' ) {
+		return LDAP_PROTOCOL_ERROR;
 	}
-	else if( !strncasecmp( start, "sub?", sizeof("sub?")-1 )) {
-		*scope = LDAP_SCOPE_SUBTREE;
-		start += sizeof("sub?")-1;
+
+	if ( mech->bv_val != NULL ) {
+		assert( mech->bv_val == id->bv_val + 2 );
+
+		AC_MEMCPY( mech->bv_val - 2, mech->bv_val, mech->bv_len + 1 );
+		mech->bv_val -= 2;
 	}
-	else {
-		free( searchbase->bv_val );
-		searchbase->bv_val = NULL;
-		return( LDAP_PROTOCOL_ERROR );
+
+	if ( realm->bv_val ) {
+		assert( realm->bv_val >= id->bv_val + 2 );
+
+		AC_MEMCPY( realm->bv_val - 2, realm->bv_val, realm->bv_len + 1 );
+		realm->bv_val -= 2;
 	}
 
-	/* Grab the filter */
-	*filter = str2filter( start );
+	/* leave "u:" before user */
+	user->bv_val -= 2;
+	user->bv_len += 2;
+	user->bv_val[ 0 ] = u;
+	user->bv_val[ 1 ] = ':';
 
-	return( LDAP_SUCCESS );
+	return LDAP_SUCCESS;
 }
 
-
-int slap_sasl_regexp_config( const char *match, const char *replace )
+static int slap_parseURI( Operation *op, struct berval *uri,
+	struct berval *base, struct berval *nbase,
+	int *scope, Filter **filter, struct berval *fstr )
 {
-#ifdef HAVE_CYRUS_SASL
-	const char *c;
-	int rc, n;
-	SaslRegexp_t *reg;
-	struct berval bv, nbv;
+	struct berval bv;
+	int rc;
+	LDAPURLDesc *ludp;
+
+	assert( uri != NULL && uri->bv_val != NULL );
+	base->bv_val = NULL;
+	base->bv_len = 0;
+	nbase->bv_val = NULL;
+	nbase->bv_len = 0;
+	fstr->bv_val = NULL;
+	fstr->bv_len = 0;
+	*scope = -1;
+	*filter = NULL;
 
-	SaslRegexp = (SaslRegexp_t *) ch_realloc( (char *) SaslRegexp,
-	  (nSaslRegexp + 1) * sizeof(SaslRegexp_t) );
-	reg = &( SaslRegexp[nSaslRegexp] );
-	ber_str2bv( match, 0, 0, &bv );
-	rc = dnNormalize2( NULL, &bv, &nbv );
-	if ( rc ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
-			   "slap_sasl_regexp_config: \"%s\" could not be normalized.\n",
-			   match ));
+	LDAP_LOG( TRANSPORT, ENTRY, 
+		"slap_parseURI: parsing %s\n", uri->bv_val, 0, 0 );
 #else
-		Debug( LDAP_DEBUG_ANY,
-		"SASL match pattern %s could not be normalized.\n",
-		match, 0, 0 );
+	Debug( LDAP_DEBUG_TRACE,
+		"slap_parseURI: parsing %s\n", uri->bv_val, 0, 0 );
 #endif
-		return( rc );
+
+	rc = LDAP_PROTOCOL_ERROR;
+	if ( !strncasecmp( uri->bv_val, "dn", sizeof( "dn" ) - 1 ) ) {
+		bv.bv_val = uri->bv_val + sizeof( "dn" ) - 1;
+
+		if ( bv.bv_val[ 0 ] == '.' ) {
+			bv.bv_val++;
+
+			if ( !strncasecmp( bv.bv_val, "exact:", sizeof( "exact:" ) - 1 ) ) {
+				bv.bv_val += sizeof( "exact:" ) - 1;
+				*scope = LDAP_X_SCOPE_EXACT;
+
+			} else if ( !strncasecmp( bv.bv_val, "regex:", sizeof( "regex:" ) - 1 ) ) {
+				bv.bv_val += sizeof( "regex:" ) - 1;
+				*scope = LDAP_X_SCOPE_REGEX;
+
+			} else if ( !strncasecmp( bv.bv_val, "children:", sizeof( "chldren:" ) - 1 ) ) {
+				bv.bv_val += sizeof( "children:" ) - 1;
+				*scope = LDAP_X_SCOPE_CHILDREN;
+
+			} else if ( !strncasecmp( bv.bv_val, "subtree:", sizeof( "subtree:" ) - 1 ) ) {
+				bv.bv_val += sizeof( "subtree:" ) - 1;
+				*scope = LDAP_X_SCOPE_SUBTREE;
+
+			} else if ( !strncasecmp( bv.bv_val, "onelevel:", sizeof( "onelevel:" ) - 1 ) ) {
+				bv.bv_val += sizeof( "onelevel:" ) - 1;
+				*scope = LDAP_X_SCOPE_ONELEVEL;
+
+			} else {
+				return LDAP_PROTOCOL_ERROR;
+			}
+		} else {
+			if ( bv.bv_val[ 0 ] != ':' ) {
+				return LDAP_PROTOCOL_ERROR;
+			}
+			*scope = LDAP_X_SCOPE_EXACT;
+			bv.bv_val++;
+		}
+
+		bv.bv_val += strspn( bv.bv_val, " " );
+		/* jump here in case no type specification was present
+		 * and uir was not an URI... HEADS-UP: assuming EXACT */
+is_dn:		bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val);
+
+		switch ( *scope ) {
+		case LDAP_X_SCOPE_EXACT:
+		case LDAP_X_SCOPE_CHILDREN:
+		case LDAP_X_SCOPE_SUBTREE:
+		case LDAP_X_SCOPE_ONELEVEL:
+			rc = dnNormalize( 0, NULL, NULL, &bv, nbase, op->o_tmpmemctx );
+			if( rc != LDAP_SUCCESS ) {
+				*scope = -1;
+			}
+			break;
+
+		case LDAP_X_SCOPE_REGEX:
+			ber_dupbv_x( nbase, &bv, op->o_tmpmemctx );
+			rc = LDAP_SUCCESS;
+			break;
+
+		default:
+			*scope = -1;
+			break;
+		}
+
+		return rc;
+
+	} else if ( ( uri->bv_val[ 0 ] == 'u' || uri->bv_val[ 0 ] == 'U' )
+			&& ( uri->bv_val[ 1 ] == ':' 
+				|| uri->bv_val[ 1 ] == '/' 
+				|| uri->bv_val[ 1 ] == '.' ) )
+	{
+		Connection	c = *op->o_conn;
+		char		buf[ SLAP_LDAPDN_MAXLEN ];
+		struct berval	id,
+				user = BER_BVNULL,
+				realm = BER_BVNULL,
+				mech = BER_BVNULL;
+
+		if ( sizeof( buf ) <= uri->bv_len ) {
+			return LDAP_INVALID_SYNTAX;
+		}
+
+		id.bv_len = uri->bv_len;
+		id.bv_val = buf;
+		strncpy( buf, uri->bv_val, sizeof( buf ) );
+
+		rc = slap_parse_user( &id, &user, &realm, &mech );
+		if ( rc != LDAP_SUCCESS ) {
+			return rc;
+		}
+
+		if ( mech.bv_val ) {
+			c.c_sasl_bind_mech = mech;
+		} else {
+			c.c_sasl_bind_mech.bv_val = "AUTHZ";
+			c.c_sasl_bind_mech.bv_len = sizeof( "AUTHZ" ) - 1;
+		}
+		
+		rc = slap_sasl_getdn( &c, op, user.bv_val, user.bv_len,
+				realm.bv_val, nbase, SLAP_GETDN_AUTHZID );
+
+		if ( rc == LDAP_SUCCESS ) {
+			*scope = LDAP_X_SCOPE_EXACT;
+		}
+
+		return rc;
+	}
+		
+	rc = ldap_url_parse( uri->bv_val, &ludp );
+	if ( rc == LDAP_URL_ERR_BADSCHEME ) {
+		/* last chance: assume it's a(n exact) DN ... */
+		bv.bv_val = uri->bv_val;
+		*scope = LDAP_X_SCOPE_EXACT;
+		goto is_dn;
 	}
-	reg->sr_match = nbv.bv_val;
 
-	ber_str2bv( replace, 0, 0, &bv );
-	rc = dnNormalize2( NULL, &bv, &nbv );
-	if ( rc ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
-			   "slap_sasl_regexp_config: \"%s\" could not be normalized.\n",
-			   replace ));
-#else
-		Debug( LDAP_DEBUG_ANY,
-		"SASL replace pattern %s could not be normalized.\n",
-		replace, 0, 0 );
-#endif
-		return( rc );
+	if ( rc != LDAP_URL_SUCCESS ) {
+		return LDAP_PROTOCOL_ERROR;
 	}
-	reg->sr_replace = nbv.bv_val;
 
-	/* Precompile matching pattern */
-	rc = regcomp( &reg->sr_workspace, reg->sr_match, REG_EXTENDED|REG_ICASE );
-	if ( rc ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
-			   "slap_sasl_regexp_config: \"%s\" could not be compiled.\n",
-			   reg->sr_match ));
-#else
-		Debug( LDAP_DEBUG_ANY,
-		"SASL match pattern %s could not be compiled by regexp engine\n",
-		reg->sr_match, 0, 0 );
-#endif
+	if (( ludp->lud_host && *ludp->lud_host )
+		|| ludp->lud_attrs || ludp->lud_exts )
+	{
+		/* host part must be empty */
+		/* attrs and extensions parts must be empty */
+		rc = LDAP_PROTOCOL_ERROR;
+		goto done;
+	}
+
+	/* Grab the scope */
+	*scope = ludp->lud_scope;
 
-		return( LDAP_OPERATIONS_ERROR );
+	/* Grab the filter */
+	if ( ludp->lud_filter ) {
+		*filter = str2filter_x( op, ludp->lud_filter );
+		if ( *filter == NULL ) {
+			rc = LDAP_PROTOCOL_ERROR;
+			goto done;
+		}
+		ber_str2bv( ludp->lud_filter, 0, 0, fstr );
+	}
+
+	/* Grab the searchbase */
+	ber_str2bv( ludp->lud_dn, 0, 0, base );
+	rc = dnNormalize( 0, NULL, NULL, base, nbase, op->o_tmpmemctx );
+
+done:
+	if( rc != LDAP_SUCCESS ) {
+		if( *filter ) filter_free_x( op, *filter );
+		base->bv_val = NULL;
+		base->bv_len = 0;
+		fstr->bv_val = NULL;
+		fstr->bv_len = 0;
+	} else {
+		/* Don't free these, return them to caller */
+		ludp->lud_filter = NULL;
+		ludp->lud_dn = NULL;
 	}
 
+	ldap_free_urldesc( ludp );
+	return( rc );
+}
+
+static int slap_sasl_rx_off(char *rep, int *off)
+{
+	const char *c;
+	int n;
+
 	/* Precompile replace pattern. Find the $<n> placeholders */
-	reg->sr_offset[0] = -2;
+	off[0] = -2;
 	n = 1;
-	for ( c = reg->sr_replace;	 *c;  c++ ) {
-		if ( *c == '\\' ) {
+	for ( c = rep;	 *c;  c++ ) {
+		if ( *c == '\\' && c[1] ) {
 			c++;
 			continue;
 		}
 		if ( *c == '$' ) {
 			if ( n == SASLREGEX_REPLACE ) {
 #ifdef NEW_LOGGING
-				LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
-					"slap_sasl_regexp_config: \"%s\" has too many $n "
-						"placeholders (max %d)\n",
-					reg->sr_replace, SASLREGEX_REPLACE ));
+				LDAP_LOG( TRANSPORT, ERR, 
+					"slap_sasl_rx_off: \"%s\" has too many $n "
+					"placeholders (max %d)\n", rep, SASLREGEX_REPLACE, 0  );
 #else
 				Debug( LDAP_DEBUG_ANY,
 					"SASL replace pattern %s has too many $n "
 						"placeholders (max %d)\n",
-					reg->sr_replace, SASLREGEX_REPLACE, 0 );
+					rep, SASLREGEX_REPLACE, 0 );
 #endif
 
-				return( LDAP_OPERATIONS_ERROR );
+				return( LDAP_OTHER );
 			}
-			reg->sr_offset[n] = c - reg->sr_replace;
+			off[n] = c - rep;
 			n++;
 		}
 	}
 
 	/* Final placeholder, after the last $n */
-	reg->sr_offset[n] = c - reg->sr_replace;
+	off[n] = c - rep;
 	n++;
-	reg->sr_offset[n] = -1;
-
-	nSaslRegexp++;
-#endif
+	off[n] = -1;
 	return( LDAP_SUCCESS );
 }
 
-
-#ifdef HAVE_CYRUS_SASL
-
-/* Take the passed in SASL name and attempt to convert it into an
-   LDAP URI to find the matching LDAP entry, using the pattern matching
-   strings given in the saslregexp config file directive(s) */
-static
-char *slap_sasl_regexp( char *saslname )
+int slap_sasl_regexp_config( const char *match, const char *replace )
 {
-	char *uri=NULL;
-	int i, n, len, insert;
+	int rc;
 	SaslRegexp_t *reg;
 
+	SaslRegexp = (SaslRegexp_t *) ch_realloc( (char *) SaslRegexp,
+	  (nSaslRegexp + 1) * sizeof(SaslRegexp_t) );
+
+	reg = &SaslRegexp[nSaslRegexp];
+
+	reg->sr_match = ch_strdup( match );
+	reg->sr_replace = ch_strdup( replace );
+
+	/* Precompile matching pattern */
+	rc = regcomp( &reg->sr_workspace, reg->sr_match, REG_EXTENDED|REG_ICASE );
+	if ( rc ) {
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-		"slap_sasl_regexp: converting SASL name %s\n", saslname ));
+		LDAP_LOG( TRANSPORT, ERR, 
+			"slap_sasl_regexp_config: \"%s\" could not be compiled.\n",
+			reg->sr_match, 0, 0 );
 #else
-	Debug( LDAP_DEBUG_TRACE, "slap_sasl_regexp: converting SASL name %s\n",
-	   saslname, 0, 0 );
+		Debug( LDAP_DEBUG_ANY,
+		"SASL match pattern %s could not be compiled by regexp engine\n",
+		reg->sr_match, 0, 0 );
 #endif
 
-	if (( saslname == NULL ) || ( nSaslRegexp == 0 ))
-		return( NULL );
-
-	/* Match the normalized SASL name to the saslregexp patterns */
-	for( reg = SaslRegexp,i=0;  i<nSaslRegexp;  i++,reg++ ) {
-		if ( regexec( &reg->sr_workspace, saslname, SASLREGEX_REPLACE,
-		  reg->sr_strings, 0)  == 0 )
-			break;
+		return( LDAP_OTHER );
 	}
 
-	if( i >= nSaslRegexp )
-		return( NULL );
+	rc = slap_sasl_rx_off( reg->sr_replace, reg->sr_offset );
+	if ( rc != LDAP_SUCCESS ) return rc;
 
-	/*
-	 * The match pattern may have been of the form "a(b.*)c(d.*)e" and the
-	 * replace pattern of the form "x$1y$2z". The returned string needs
-	 * to replace the $1,$2 with the strings that matched (b.*) and (d.*)
-	 */
+	nSaslRegexp++;
+	return( LDAP_SUCCESS );
+}
 
 
+/* Perform replacement on regexp matches */
+static void slap_sasl_rx_exp(
+	const char *rep,
+	const int *off,
+	regmatch_t *str,
+	const char *saslname,
+	struct berval *out,
+	void *ctx )
+{
+	int i, n, len, insert;
+
 	/* Get the total length of the final URI */
 
 	n=1;
 	len = 0;
-	while( reg->sr_offset[n] >= 0 ) {
+	while( off[n] >= 0 ) {
 		/* Len of next section from replacement string (x,y,z above) */
-		len += reg->sr_offset[n] - reg->sr_offset[n-1] - 2;
-		if( reg->sr_offset[n+1] < 0)
+		len += off[n] - off[n-1] - 2;
+		if( off[n+1] < 0)
 			break;
 
 		/* Len of string from saslname that matched next $i  (b,d above) */
-		i = reg->sr_replace[ reg->sr_offset[n] + 1 ]	- '0';
-		len += reg->sr_strings[i].rm_eo - reg->sr_strings[i].rm_so;
+		i = rep[ off[n] + 1 ]	- '0';
+		len += str[i].rm_eo - str[i].rm_so;
 		n++;
 	}
-	uri = ch_malloc( len + 1 );
+	out->bv_val = sl_malloc( len + 1, ctx );
+	out->bv_len = len;
 
 	/* Fill in URI with replace string, replacing $i as we go */
 	n=1;
 	insert = 0;
-	while( reg->sr_offset[n] >= 0) {
+	while( off[n] >= 0) {
 		/* Paste in next section from replacement string (x,y,z above) */
-		len = reg->sr_offset[n] - reg->sr_offset[n-1] - 2;
-		strncpy( uri+insert, reg->sr_replace + reg->sr_offset[n-1] + 2, len);
+		len = off[n] - off[n-1] - 2;
+		strncpy( out->bv_val+insert, rep + off[n-1] + 2, len);
 		insert += len;
-		if( reg->sr_offset[n+1] < 0)
+		if( off[n+1] < 0)
 			break;
 
 		/* Paste in string from saslname that matched next $i  (b,d above) */
-		i = reg->sr_replace[ reg->sr_offset[n] + 1 ]	- '0';
-		len = reg->sr_strings[i].rm_eo - reg->sr_strings[i].rm_so;
-		strncpy( uri+insert, saslname + reg->sr_strings[i].rm_so, len );
+		i = rep[ off[n] + 1 ]	- '0';
+		len = str[i].rm_eo - str[i].rm_so;
+		strncpy( out->bv_val+insert, saslname + str[i].rm_so, len );
 		insert += len;
 
 		n++;
 	}
 
-	uri[insert] = '\0';
-#ifdef NEW_LOGGING
-	LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-		"slap_sasl_regexp: converted SASL name to %s\n", uri ));
-#else
-	Debug( LDAP_DEBUG_TRACE,
-	   "slap_sasl_regexp: converted SASL name to %s\n", uri, 0, 0 );
-#endif
-
-	return( uri );
+	out->bv_val[insert] = '\0';
 }
 
-/* Two empty callback functions to avoid sending results */
-static void sasl_sc_r( Connection *conn, Operation *o, ber_tag_t tag,
-	ber_int_t msgid, ber_int_t err, const char *matched,
-	const char *text, BerVarray ref, const char *resoid,
-	struct berval *resdata, struct berval *sasldata, LDAPControl **c)
-{
-}
+/* Take the passed in SASL name and attempt to convert it into an
+   LDAP URI to find the matching LDAP entry, using the pattern matching
+   strings given in the saslregexp config file directive(s) */
 
-static void sasl_sc_s( Connection *conn, Operation *o, ber_int_t err,
-	const char *matched, const char *text, BerVarray refs, LDAPControl **c,
-	int nentries)
+static int slap_sasl_regexp( struct berval *in, struct berval *out,
+		int flags, void *ctx )
 {
-}
-
-/* This callback actually does some work...*/
-static int sasl_sc_sasl2dn( BackendDB *be, Connection *conn, Operation *o,
-	Entry *e, AttributeName *an, int ao, LDAPControl **c)
-{
-	struct berval *ndn = o->o_callback->sc_private;
-
-	/* We only want to be called once */
-	if (ndn->bv_val) {
-		free(ndn->bv_val);
-		ndn->bv_val = NULL;
-#ifdef NEW_LOGGING
-	LDAP_LOG(( "sasl", LDAP_LEVEL_DETAIL1,
-		   "slap_sasl2dn: search DN returned more than 1 entry\n" ));
-#else
-	Debug( LDAP_DEBUG_TRACE,
-	   "slap_sasl2dn: search DN returned more than 1 entry\n", 0,0,0 );
-#endif
-		return -1;
-	} else {
-		ber_dupbv(ndn, &e->e_nname);
-		return 0;
-	}
-}
-
-/*
- * Given a SASL name (e.g. "UID=name,cn=REALM,cn=MECH,cn=AUTH")
- * return the LDAP DN to which it matches. The SASL regexp rules in the config
- * file turn the SASL name into an LDAP URI. If the URI is just a DN (or a
- * search with scope=base), just return the URI (or its searchbase). Otherwise
- * an internal search must be done, and if that search returns exactly one
- * entry, return the DN of that one entry.
- */
+	char *saslname = in->bv_val;
+	SaslRegexp_t *reg;
+  	regmatch_t sr_strings[SASLREGEX_REPLACE];	/* strings matching $1,$2 ... */
+	int i;
 
-void slap_sasl2dn( struct berval *saslname, struct berval *dn )
-{
-	char *uri=NULL;
-	struct berval searchbase = {0, NULL};
-	int rc, scope;
-	Backend *be;
-	Filter *filter=NULL;
-	slap_callback cb = {sasl_sc_r, sasl_sc_s, sasl_sc_sasl2dn, NULL};
-	Operation op = {0};
+	memset( out, 0, sizeof( *out ) );
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-		"slap_sasl2dn: converting SASL name %s to DN.\n", saslname->bv_val ));
+	LDAP_LOG( TRANSPORT, ENTRY, 
+		"slap_sasl_regexp: converting SASL name %s\n", saslname, 0, 0 );
 #else
-	Debug( LDAP_DEBUG_TRACE,
-		"==>slap_sasl2dn: Converting SASL name %s to a DN\n", saslname->bv_val, 0,0 );
+	Debug( LDAP_DEBUG_TRACE, "slap_sasl_regexp: converting SASL name %s\n",
+	   saslname, 0, 0 );
 #endif
-	dn->bv_val = NULL;
-	dn->bv_len = 0;
-	cb.sc_private = dn;
-
-	/* Convert the SASL name into an LDAP URI */
-	uri = slap_sasl_regexp( saslname->bv_val );
-	if( uri == NULL )
-		goto FINISHED;
 
-	rc = slap_parseURI( uri, &searchbase, &scope, &filter );
-	if( rc ) {
-		goto FINISHED;
+	if (( saslname == NULL ) || ( nSaslRegexp == 0 )) {
+		return( 0 );
 	}
 
-	/* Massive shortcut: search scope == base */
-	if( scope == LDAP_SCOPE_BASE ) {
-		*dn = searchbase;
-		searchbase.bv_len = 0;
-		searchbase.bv_val = NULL;
-		goto FINISHED;
+	/* Match the normalized SASL name to the saslregexp patterns */
+	for( reg = SaslRegexp,i=0;  i<nSaslRegexp;  i++,reg++ ) {
+		if ( regexec( &reg->sr_workspace, saslname, SASLREGEX_REPLACE,
+		  sr_strings, 0)  == 0 )
+			break;
 	}
 
-	/* Must do an internal search */
+	if( i >= nSaslRegexp ) return( 0 );
+
+	/*
+	 * The match pattern may have been of the form "a(b.*)c(d.*)e" and the
+	 * replace pattern of the form "x$1y$2z". The returned string needs
+	 * to replace the $1,$2 with the strings that matched (b.*) and (d.*)
+	 */
+	slap_sasl_rx_exp( reg->sr_replace, reg->sr_offset,
+		sr_strings, saslname, out, ctx );
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "sasl", LDAP_LEVEL_DETAIL1,
-		   "slap_sasl2dn: performing internal search (base=%s, scope=%d)\n",
-		   searchbase.bv_val, scope ));
+	LDAP_LOG( TRANSPORT, ENTRY, 
+		"slap_sasl_regexp: converted SASL name to %s\n",
+		out->bv_len ? out->bv_val : "", 0, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE,
-	   "slap_sasl2dn: performing internal search (base=%s, scope=%d)\n",
-	   searchbase.bv_val, scope, 0 );
+		"slap_sasl_regexp: converted SASL name to %s\n",
+		out->bv_len ? out->bv_val : "", 0, 0 );
 #endif
 
-	be = select_backend( &searchbase, 0, 1 );
-	if(( be == NULL ) || ( be->be_search == NULL))
-		goto FINISHED;
-	suffix_alias( be, &searchbase );
+	return( 1 );
+}
 
-	ldap_pvt_thread_mutex_init( &op.o_abandonmutex );
-	op.o_tag = LDAP_REQ_SEARCH;
-	op.o_protocol = LDAP_VERSION3;
-	op.o_ndn = *saslname;
-	op.o_callback = &cb;
-	op.o_time = slap_get_time();
+/* This callback actually does some work...*/
+static int sasl_sc_sasl2dn( Operation *o, SlapReply *rs )
+{
+	struct berval *ndn = o->o_callback->sc_private;
 
-	(*be->be_search)( be, /*conn*/NULL, &op, /*base*/NULL, &searchbase,
-	   scope, /*deref=*/1, /*sizelimit=*/1, /*time=*/0, filter, /*fstr=*/NULL,
-	   /*attrs=*/NULL, /*attrsonly=*/0 );
-	
-	ldap_pvt_thread_mutex_destroy( &op.o_abandonmutex );
+	if (rs->sr_type != REP_SEARCH) return 0;
 
-FINISHED:
-	if( searchbase.bv_len ) ch_free( searchbase.bv_val );
-	if( filter ) filter_free( filter );
-	if( uri ) ch_free( uri );
+	/* We only want to be called once */
+	if( ndn->bv_val ) {
+		o->o_tmpfree(ndn->bv_val, o->o_tmpmemctx);
+		ndn->bv_val = NULL;
+		ndn->bv_len = 0;
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-		"slap_sasl2dn: Converted SASL name to %s\n",
-		dn->bv_len ? dn->bv_val : "<nothing>" ));
+		LDAP_LOG( TRANSPORT, DETAIL1,
+			"slap_sc_sasl2dn: search DN returned more than 1 entry\n", 0, 0, 0 );
 #else
-	Debug( LDAP_DEBUG_TRACE, "<==slap_sasl2dn: Converted SASL name to %s\n",
-		dn->bv_len ? dn->bv_val : "<nothing>", 0, 0 );
+		Debug( LDAP_DEBUG_TRACE,
+			"slap_sc_sasl2dn: search DN returned more than 1 entry\n", 0, 0, 0 );
 #endif
+		return -1;
+	}
 
-	return;
+	ber_dupbv_x(ndn, &rs->sr_entry->e_nname, o->o_tmpmemctx);
+	return 0;
 }
 
+
 typedef struct smatch_info {
 	struct berval *dn;
 	int match;
 } smatch_info;
 
-static int sasl_sc_smatch( BackendDB *be, Connection *conn, Operation *o,
-	Entry *e, AttributeName *an, int ao, LDAPControl **c)
+static int sasl_sc_smatch( Operation *o, SlapReply *rs )
 {
 	smatch_info *sm = o->o_callback->sc_private;
 
-	if (dn_match(sm->dn, &e->e_nname)) {
+	if (rs->sr_type != REP_SEARCH) return 0;
+
+	if (dn_match(sm->dn, &rs->sr_entry->e_nname)) {
 		sm->match = 1;
 		return -1;	/* short-circuit the search */
-	} else {
-		return 1;
 	}
+
+	return 1;
 }
 
 /*
@@ -474,90 +608,169 @@ static int sasl_sc_smatch( BackendDB *be, Connection *conn, Operation *o,
  */
 
 static
-int slap_sasl_match( char *rule, struct berval *assertDN, struct berval *authc )
+int slap_sasl_match( Operation *opx, struct berval *rule,
+	struct berval *assertDN, struct berval *authc )
 {
-	struct berval searchbase = {0, NULL};
-	int rc, scope;
-	Backend *be;
-	Filter *filter=NULL;
+	int rc; 
 	regex_t reg;
 	smatch_info sm;
-	slap_callback cb = {sasl_sc_r, sasl_sc_s, sasl_sc_smatch, &sm};
+	slap_callback cb = { NULL, sasl_sc_smatch, NULL, NULL };
 	Operation op = {0};
+	SlapReply rs = {REP_RESULT};
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-		"slap_sasl_match: comparing DN %s to rule %s\n", assertDN->bv_val, rule ));
+	LDAP_LOG( TRANSPORT, ENTRY, 
+		"slap_sasl_match: comparing DN %s to rule %s\n", 
+		assertDN->bv_val, rule->bv_val,0 );
 #else
 	Debug( LDAP_DEBUG_TRACE,
-	   "===>slap_sasl_match: comparing DN %s to rule %s\n", assertDN->bv_val, rule, 0 );
+	   "===>slap_sasl_match: comparing DN %s to rule %s\n",
+		assertDN->bv_val, rule->bv_val, 0 );
 #endif
 
-	rc = slap_parseURI( rule, &searchbase, &scope, &filter );
-	if( rc != LDAP_SUCCESS )
+	rc = slap_parseURI( opx, rule, &op.o_req_dn,
+		&op.o_req_ndn, &op.oq_search.rs_scope, &op.oq_search.rs_filter,
+		&op.ors_filterstr );
+	if( rc != LDAP_SUCCESS ) goto CONCLUDED;
+
+	switch ( op.oq_search.rs_scope ) {
+	case LDAP_X_SCOPE_EXACT:
+exact_match:
+		if ( dn_match( &op.o_req_ndn, assertDN ) ) {
+			rc = LDAP_SUCCESS;
+		} else {
+			rc = LDAP_INAPPROPRIATE_AUTH;
+		}
 		goto CONCLUDED;
 
-	/* Massive shortcut: search scope == base */
-	if( scope == LDAP_SCOPE_BASE ) {
-		rc = regcomp(&reg, searchbase.bv_val,
+	case LDAP_X_SCOPE_CHILDREN:
+	case LDAP_X_SCOPE_SUBTREE:
+	case LDAP_X_SCOPE_ONELEVEL:
+	{
+		int	d = assertDN->bv_len - op.o_req_ndn.bv_len;
+
+		rc = LDAP_INAPPROPRIATE_AUTH;
+
+		if ( d == 0 && op.oq_search.rs_scope == LDAP_X_SCOPE_SUBTREE ) {
+			goto exact_match;
+
+		} else if ( d > 0 ) {
+			struct berval bv;
+
+			bv.bv_len = op.o_req_ndn.bv_len;
+			bv.bv_val = assertDN->bv_val + d;
+
+			if ( bv.bv_val[ -1 ] == ',' && dn_match( &op.o_req_ndn, &bv ) ) {
+				switch ( op.oq_search.rs_scope ) {
+				case LDAP_X_SCOPE_SUBTREE:
+				case LDAP_X_SCOPE_CHILDREN:
+					rc = LDAP_SUCCESS;
+					break;
+
+				case LDAP_X_SCOPE_ONELEVEL:
+				{
+					struct berval	pdn;
+
+					dnParent( assertDN, &pdn );
+					/* the common portion of the DN
+					 * already matches, so only check
+					 * if parent DN of assertedDN 
+					 * is all the pattern */
+					if ( pdn.bv_len == op.o_req_ndn.bv_len ) {
+						rc = LDAP_SUCCESS;
+					}
+					break;
+				}
+				default:
+					/* at present, impossible */
+					assert( 0 );
+				}
+			}
+		}
+		goto CONCLUDED;
+	}
+
+	case LDAP_X_SCOPE_REGEX:
+		rc = regcomp(&reg, op.o_req_ndn.bv_val,
 			REG_EXTENDED|REG_ICASE|REG_NOSUB);
 		if ( rc == 0 ) {
 			rc = regexec(&reg, assertDN->bv_val, 0, NULL, 0);
 			regfree( &reg );
 		}
-		if ( rc == 0 )
+		if ( rc == 0 ) {
 			rc = LDAP_SUCCESS;
-		else
+		} else {
 			rc = LDAP_INAPPROPRIATE_AUTH;
+		}
 		goto CONCLUDED;
+
+	default:
+		break;
 	}
 
 	/* Must run an internal search. */
+	if ( op.oq_search.rs_filter == NULL ) {
+		rc = LDAP_FILTER_ERROR;
+		goto CONCLUDED;
+	}
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "sasl", LDAP_LEVEL_DETAIL1,
+	LDAP_LOG( TRANSPORT, DETAIL1, 
 		"slap_sasl_match: performing internal search (base=%s, scope=%d)\n",
-		searchbase.bv_val, scope ));
+		op.o_req_ndn.bv_val, op.oq_search.rs_scope, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE,
 	   "slap_sasl_match: performing internal search (base=%s, scope=%d)\n",
-	   searchbase.bv_val, scope, 0 );
+	   op.o_req_ndn.bv_val, op.oq_search.rs_scope, 0 );
 #endif
 
-	be = select_backend( &searchbase, 0, 1 );
-	if(( be == NULL ) || ( be->be_search == NULL)) {
+	op.o_bd = select_backend( &op.o_req_ndn, 0, 1 );
+	if(( op.o_bd == NULL ) || ( op.o_bd->be_search == NULL)) {
 		rc = LDAP_INAPPROPRIATE_AUTH;
 		goto CONCLUDED;
 	}
-	suffix_alias( be, &searchbase );
 
 	sm.dn = assertDN;
 	sm.match = 0;
+	cb.sc_private = &sm;
 
-	ldap_pvt_thread_mutex_init( &op.o_abandonmutex );
 	op.o_tag = LDAP_REQ_SEARCH;
 	op.o_protocol = LDAP_VERSION3;
 	op.o_ndn = *authc;
 	op.o_callback = &cb;
 	op.o_time = slap_get_time();
+	op.o_do_not_cache = 1;
+	op.o_is_auth_check = 1;
+	op.o_threadctx = opx->o_threadctx;
+	op.o_tmpmemctx = opx->o_tmpmemctx;
+	op.o_tmpmfuncs = opx->o_tmpmfuncs;
+#ifdef LDAP_SLAPI
+	op.o_pb = opx->o_pb;
+#endif
+	op.o_conn = opx->o_conn;
+	op.o_connid = opx->o_connid;
+	op.o_req_dn = op.o_req_ndn;
+	op.oq_search.rs_slimit = 1;
+	op.oq_search.rs_tlimit = -1;
+	op.o_sync_slog_size = -1;
 
-	(*be->be_search)( be, /*conn=*/NULL, &op, /*base=*/NULL, &searchbase,
-	   scope, /*deref=*/1, /*sizelimit=*/0, /*time=*/0, filter, /*fstr=*/NULL,
-	   /*attrs=*/NULL, /*attrsonly=*/0 );
-
-	ldap_pvt_thread_mutex_destroy( &op.o_abandonmutex );
+	op.o_bd->be_search( &op, &rs );
 
-	if (sm.match)
+	if (sm.match) {
 		rc = LDAP_SUCCESS;
-	else
+	} else {
 		rc = LDAP_INAPPROPRIATE_AUTH;
+	}
 
 CONCLUDED:
-	if( searchbase.bv_len ) ch_free( searchbase.bv_val );
-	if( filter ) filter_free( filter );
+	if( op.o_req_dn.bv_val && op.o_req_dn.bv_val != op.o_req_ndn.bv_val ) ch_free( op.o_req_dn.bv_val );
+	if( op.o_req_ndn.bv_val ) sl_free( op.o_req_ndn.bv_val, opx->o_tmpmemctx );
+	if( op.oq_search.rs_filter ) filter_free_x( opx, op.oq_search.rs_filter );
+	if( op.ors_filterstr.bv_val ) ch_free( op.ors_filterstr.bv_val );
+
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-		   "slap_sasl_match: comparison returned %d\n", rc ));
+	LDAP_LOG( TRANSPORT, ENTRY, 
+		"slap_sasl_match: comparison returned %d\n", rc, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE,
 	   "<===slap_sasl_match: comparison returned %d\n", rc, 0, 0);
@@ -573,77 +786,200 @@ CONCLUDED:
  * attribute named by *attr. If any of those rules map to the *assertDN, the
  * authorization is approved.
  *
- * DN's passed in should have a dn: prefix
+ * The DNs should not have the dn: prefix
  */
 static int
-slap_sasl_check_authz(struct berval *searchDN, struct berval *assertDN, struct berval *attr, struct berval *authc)
+slap_sasl_check_authz( Operation *op,
+	struct berval *searchDN,
+	struct berval *assertDN,
+	AttributeDescription *ad,
+	struct berval *authc )
 {
-	const char *errmsg;
 	int i, rc;
 	BerVarray vals=NULL;
-	AttributeDescription *ad=NULL;
-	struct berval bv;
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-		   "slap_sasl_check_authz: does %s match %s rule in %s?\n",
-		   assertDN->bv_val, attr->bv_val, searchDN->bv_val ));
+	LDAP_LOG( TRANSPORT, ENTRY, 
+		"slap_sasl_check_authz: does %s match %s rule in %s?\n",
+	    assertDN->bv_val, ad->ad_cname.bv_val, searchDN->bv_val);
 #else
 	Debug( LDAP_DEBUG_TRACE,
 	   "==>slap_sasl_check_authz: does %s match %s rule in %s?\n",
-	   assertDN->bv_val, attr->bv_val, searchDN->bv_val);
+	   assertDN->bv_val, ad->ad_cname.bv_val, searchDN->bv_val);
 #endif
 
-	rc = slap_bv2ad( attr, &ad, &errmsg );
-	if( rc != LDAP_SUCCESS )
-		goto COMPLETE;
-
-	bv.bv_val = searchDN->bv_val + 3;
-	bv.bv_len = searchDN->bv_len - 3;
-	rc = backend_attribute( NULL, NULL, NULL, NULL, &bv, ad, &vals );
-	if( rc != LDAP_SUCCESS )
-		goto COMPLETE;
+	rc = backend_attribute( op, NULL,
+		searchDN, ad, &vals );
+	if( rc != LDAP_SUCCESS ) goto COMPLETE;
 
-	bv.bv_val = assertDN->bv_val + 3;
-	bv.bv_len = assertDN->bv_len - 3;
 	/* Check if the *assertDN matches any **vals */
-	for( i=0; vals[i].bv_val != NULL; i++ ) {
-		rc = slap_sasl_match( vals[i].bv_val, &bv, authc );
-		if ( rc == LDAP_SUCCESS )
-			goto COMPLETE;
+	if( vals != NULL ) {
+		for( i=0; vals[i].bv_val != NULL; i++ ) {
+			rc = slap_sasl_match( op, &vals[i], assertDN, authc );
+			if ( rc == LDAP_SUCCESS ) goto COMPLETE;
+		}
 	}
 	rc = LDAP_INAPPROPRIATE_AUTH;
 
 COMPLETE:
-	if( vals ) ber_bvarray_free( vals );
+	if( vals ) ber_bvarray_free_x( vals, op->o_tmpmemctx );
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-		   "slap_sasl_check_authz: %s check returning %s\n", attr->bv_val, rc ));
+	LDAP_LOG( TRANSPORT, RESULTS, 
+		"slap_sasl_check_authz: %s check returning %s\n", 
+		ad->ad_cname.bv_val, rc, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE,
-	   "<==slap_sasl_check_authz: %s check returning %d\n", attr->bv_val, rc, 0);
+	   "<==slap_sasl_check_authz: %s check returning %d\n",
+		ad->ad_cname.bv_val, rc, 0);
 #endif
 
 	return( rc );
 }
-#endif	/* HAVE_CYRUS_SASL */
 
+/*
+ * Given a SASL name (e.g. "UID=name,cn=REALM,cn=MECH,cn=AUTH")
+ * return the LDAP DN to which it matches. The SASL regexp rules in the config
+ * file turn the SASL name into an LDAP URI. If the URI is just a DN (or a
+ * search with scope=base), just return the URI (or its searchbase). Otherwise
+ * an internal search must be done, and if that search returns exactly one
+ * entry, return the DN of that one entry.
+ */
+void slap_sasl2dn( Operation *opx,
+	struct berval *saslname, struct berval *sasldn, int flags )
+{
+	int rc;
+	slap_callback cb = { NULL, sasl_sc_sasl2dn, NULL, NULL };
+	Operation op = {0};
+	SlapReply rs = {REP_RESULT};
+	struct berval regout = BER_BVNULL;
 
-/* Check if a bind can SASL authorize to another identity.
-   Accepts authorization DN's with "dn:" prefix */
+#ifdef NEW_LOGGING
+	LDAP_LOG( TRANSPORT, ENTRY, 
+		"slap_sasl2dn: converting SASL name %s to DN.\n",
+		saslname->bv_val, 0, 0 );
+#else
+	Debug( LDAP_DEBUG_TRACE, "==>slap_sasl2dn: "
+		"converting SASL name %s to a DN\n",
+		saslname->bv_val, 0,0 );
+#endif
+
+	sasldn->bv_val = NULL;
+	sasldn->bv_len = 0;
+	cb.sc_private = sasldn;
+
+	/* Convert the SASL name into a minimal URI */
+	if( !slap_sasl_regexp( saslname, &regout, flags, opx->o_tmpmemctx ) ) {
+		goto FINISHED;
+	}
+
+	rc = slap_parseURI( opx, &regout, &op.o_req_dn,
+		&op.o_req_ndn, &op.oq_search.rs_scope, &op.oq_search.rs_filter,
+		&op.ors_filterstr );
+	if( regout.bv_val ) sl_free( regout.bv_val, opx->o_tmpmemctx );
+	if( rc != LDAP_SUCCESS ) {
+		goto FINISHED;
+	}
 
-static struct berval sasl_authz_src = {
-	sizeof(SASL_AUTHZ_SOURCE_ATTR)-1, SASL_AUTHZ_SOURCE_ATTR };
+	/* Must do an internal search */
+	op.o_bd = select_backend( &op.o_req_ndn, 0, 1 );
+
+	switch ( op.oq_search.rs_scope ) {
+	case LDAP_X_SCOPE_EXACT:
+		*sasldn = op.o_req_ndn;
+		op.o_req_ndn.bv_len = 0;
+		op.o_req_ndn.bv_val = NULL;
+		/* intentionally continue to next case */
+
+	case LDAP_X_SCOPE_REGEX:
+	case LDAP_X_SCOPE_SUBTREE:
+	case LDAP_X_SCOPE_CHILDREN:
+	case LDAP_X_SCOPE_ONELEVEL:
+		/* correctly parsed, but illegal */
+		goto FINISHED;
 
-static struct berval sasl_authz_dst = {
-	sizeof(SASL_AUTHZ_DEST_ATTR)-1, SASL_AUTHZ_DEST_ATTR };
+	case LDAP_SCOPE_BASE:
+	case LDAP_SCOPE_ONELEVEL:
+	case LDAP_SCOPE_SUBTREE:
+#ifdef LDAP_SCOPE_SUBORDINATE
+	case LDAP_SCOPE_SUBORDINATE:
+#endif
+		/* do a search */
+		break;
+
+	default:
+		/* catch unhandled cases (there shouldn't be) */
+		assert( 0 );
+	}
 
-int slap_sasl_authorized( struct berval *authcDN, struct berval *authzDN )
+#ifdef NEW_LOGGING
+	LDAP_LOG( TRANSPORT, DETAIL1, 
+		"slap_sasl2dn: performing internal search (base=%s, scope=%d)\n",
+		op.o_req_ndn.bv_val, op.oq_search.rs_scope, 0 );
+#else
+	Debug( LDAP_DEBUG_TRACE,
+		"slap_sasl2dn: performing internal search (base=%s, scope=%d)\n",
+		op.o_req_ndn.bv_val, op.oq_search.rs_scope, 0 );
+#endif
+
+	if(( op.o_bd == NULL ) || ( op.o_bd->be_search == NULL)) {
+		goto FINISHED;
+	}
+
+	op.o_conn = opx->o_conn;
+	op.o_connid = opx->o_connid;
+	op.o_tag = LDAP_REQ_SEARCH;
+	op.o_protocol = LDAP_VERSION3;
+	op.o_ndn = opx->o_conn->c_ndn;
+	op.o_callback = &cb;
+	op.o_time = slap_get_time();
+	op.o_do_not_cache = 1;
+	op.o_is_auth_check = 1;
+	op.o_threadctx = opx->o_threadctx;
+	op.o_tmpmemctx = opx->o_tmpmemctx;
+	op.o_tmpmfuncs = opx->o_tmpmfuncs;
+#ifdef LDAP_SLAPI
+	op.o_pb = opx->o_pb;
+#endif
+	op.oq_search.rs_deref = LDAP_DEREF_NEVER;
+	op.oq_search.rs_slimit = 1;
+	op.oq_search.rs_tlimit = -1;
+	op.oq_search.rs_attrsonly = 1;
+	op.o_req_dn = op.o_req_ndn;
+
+	op.o_bd->be_search( &op, &rs );
+	
+FINISHED:
+	if( sasldn->bv_len ) {
+		opx->o_conn->c_authz_backend = op.o_bd;
+	}
+	if( op.o_req_dn.bv_len ) ch_free( op.o_req_dn.bv_val );
+	if( op.o_req_ndn.bv_len ) sl_free( op.o_req_ndn.bv_val, opx->o_tmpmemctx );
+	if( op.oq_search.rs_filter ) filter_free_x( opx, op.oq_search.rs_filter );
+	if( op.ors_filterstr.bv_len ) ch_free( op.ors_filterstr.bv_val );
+
+#ifdef NEW_LOGGING
+	LDAP_LOG( TRANSPORT, ENTRY, 
+		"slap_sasl2dn: Converted SASL name to %s\n",
+		sasldn->bv_len ? sasldn->bv_val : "<nothing>", 0, 0 );
+#else
+	Debug( LDAP_DEBUG_TRACE, "<==slap_sasl2dn: Converted SASL name to %s\n",
+		sasldn->bv_len ? sasldn->bv_val : "<nothing>", 0, 0 );
+#endif
+
+	return;
+}
+
+
+/* Check if a bind can SASL authorize to another identity.
+ * The DNs should not have the dn: prefix
+ */
+
+int slap_sasl_authorized( Operation *op,
+	struct berval *authcDN, struct berval *authzDN )
 {
 	int rc = LDAP_INAPPROPRIATE_AUTH;
 
-#ifdef HAVE_CYRUS_SASL
 	/* User binding as anonymous */
 	if ( authzDN == NULL ) {
 		rc = LDAP_SUCCESS;
@@ -651,11 +987,13 @@ int slap_sasl_authorized( struct berval *authcDN, struct berval *authzDN )
 	}
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-		"slap_sasl_authorized: can %s become %s?\n", authcDN->bv_val, authzDN->bv_val ));
+	LDAP_LOG( TRANSPORT, ENTRY, 
+		"slap_sasl_authorized: can %s become %s?\n", 
+		authcDN->bv_val, authzDN->bv_val, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE,
-	   "==>slap_sasl_authorized: can %s become %s?\n", authcDN->bv_val, authzDN->bv_val, 0 );
+	   "==>slap_sasl_authorized: can %s become %s?\n",
+		authcDN->bv_val, authzDN->bv_val, 0 );
 #endif
 
 	/* If person is authorizing to self, succeed */
@@ -664,28 +1002,38 @@ int slap_sasl_authorized( struct berval *authcDN, struct berval *authzDN )
 		goto DONE;
 	}
 
-	/* Check source rules */
-	rc = slap_sasl_check_authz( authcDN, authzDN, &sasl_authz_src,
-	   authcDN );
-	if( rc == LDAP_SUCCESS ) {
+	/* Allow the manager to authorize as any DN. */
+	if( op->o_conn->c_authz_backend &&
+		be_isroot_dn( op->o_conn->c_authz_backend, authcDN ))
+	{
+		rc = LDAP_SUCCESS;
 		goto DONE;
 	}
 
+	/* Check source rules */
+	if( authz_policy & SASL_AUTHZ_TO ) {
+		rc = slap_sasl_check_authz( op, authcDN, authzDN,
+			slap_schema.si_ad_saslAuthzTo, authcDN );
+		if( rc == LDAP_SUCCESS && !(authz_policy & SASL_AUTHZ_AND) ) {
+			goto DONE;
+		}
+	}
+
 	/* Check destination rules */
-	rc = slap_sasl_check_authz( authzDN, authcDN, &sasl_authz_dst,
-	   authcDN );
-	if( rc == LDAP_SUCCESS ) {
-		goto DONE;
+	if( authz_policy & SASL_AUTHZ_FROM ) {
+		rc = slap_sasl_check_authz( op, authzDN, authcDN,
+			slap_schema.si_ad_saslAuthzFrom, authcDN );
+		if( rc == LDAP_SUCCESS ) {
+			goto DONE;
+		}
 	}
 
 	rc = LDAP_INAPPROPRIATE_AUTH;
 
 DONE:
-#endif
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-		"slap_sasl_authorized: return %d\n", rc ));
+	LDAP_LOG( TRANSPORT, RESULTS, "slap_sasl_authorized: return %d\n", rc,0,0 );
 #else
 	Debug( LDAP_DEBUG_TRACE,
 		"<== slap_sasl_authorized: return %d\n", rc, 0, 0 );