X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsaslauthz.c;h=7b44cd6768e06c6566a3165d057a5edb08939ca0;hb=ca9bb44089145bdb7435135714590d48f4a6eabd;hp=4e03b68280f517daa935aba8a98a265f3b309741;hpb=1353ded30c8a7aba0a3829c39af1a1cbe2c49eb2;p=openldap

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index 4e03b68280..7b44cd6768 100644
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -1,3 +1,7 @@
+/*
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 2000, Mark Adamson, Carnegie Mellon.  All rights reserved.
  * This software is not subject to any license of Carnegie Mellon University.
@@ -19,21 +23,51 @@
 
 #include "slap.h"
 
-#ifdef HAVE_CYRUS_SASL
 #include <limits.h>
 
-#ifdef HAVE_SASL_SASL_H
-#include <sasl/sasl.h>
-#else
-#include <sasl.h>
-#endif
-
 #include <ldap_pvt.h>
-#endif
+
+#define SASLREGEX_REPLACE 10
+
+typedef struct sasl_regexp {
+  char *sr_match;							/* regexp match pattern */
+  char *sr_replace; 						/* regexp replace pattern */
+  regex_t sr_workspace;						/* workspace for regexp engine */
+  regmatch_t sr_strings[SASLREGEX_REPLACE];	/* strings matching $1,$2 ... */
+  int sr_offset[SASLREGEX_REPLACE+2];		/* offsets of $1,$2... in *replace */
+} SaslRegexp_t;
+
+static int nSaslRegexp = 0;
+static SaslRegexp_t *SaslRegexp = NULL;
+
+/* What SASL proxy authorization policies are allowed? */
+#define	SASL_AUTHZ_NONE	0
+#define	SASL_AUTHZ_FROM	1
+#define	SASL_AUTHZ_TO	2
+
+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 ) {
+		authz_policy = SASL_AUTHZ_FROM | SASL_AUTHZ_TO;
+	} else {
+		rc = LDAP_OTHER;
+	}
+	return rc;
+}
 
 /* URI format: ldap://<host>/<base>[?[<attrs>][?[<scope>][?[<filter>]]]] */
 
-static int slap_parseURI( struct berval *uri,
+static int slap_parseURI( Operation *op, struct berval *uri,
 	struct berval *searchbase, int *scope, Filter **filter )
 {
 	struct berval bv;
@@ -47,8 +81,8 @@ static int slap_parseURI( struct berval *uri,
 	*filter = NULL;
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-		"slap_parseURI: parsing %s\n", uri->bv_val ));
+	LDAP_LOG( TRANSPORT, ENTRY, 
+		"slap_parseURI: parsing %s\n", uri->bv_val, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE, "slap_parseURI: parsing %s\n", uri->bv_val, 0, 0 );
 #endif
@@ -58,9 +92,10 @@ static int slap_parseURI( struct berval *uri,
 		bv.bv_val = uri->bv_val + sizeof("dn:")-1;
 		bv.bv_val += strspn( bv.bv_val, " " );
 
-is_dn:		bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val);
-		rc = dnNormalize2( NULL, &bv, searchbase );
-		if (rc == LDAP_SUCCESS) {
+is_dn:	bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val);
+
+		rc = dnNormalize2( NULL, &bv, searchbase, op->o_tmpmemctx );
+		if( rc == LDAP_SUCCESS ) {
 			*scope = LDAP_SCOPE_BASE;
 		}
 		return( rc );
@@ -73,369 +108,270 @@ is_dn:		bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val);
 	}
 
 	if ( rc != LDAP_URL_SUCCESS ) {
-		return( LDAP_PROTOCOL_ERROR );
+		return LDAP_PROTOCOL_ERROR;
 	}
 
-	/* could check the hostname here */
+	if (( ludp->lud_host && *ludp->lud_host )
+		|| ludp->lud_attrs || ludp->lud_exts )
+	{
+		/* host part should be empty */
+		/* attrs and extensions parts should be empty */
+		return LDAP_PROTOCOL_ERROR;
+	}
 
 	/* Grab the scope */
 	*scope = ludp->lud_scope;
 
 	/* Grab the filter */
 	if ( ludp->lud_filter ) {
-		*filter = str2filter( ludp->lud_filter );
+		*filter = str2filter_x( op, ludp->lud_filter );
+		if ( *filter == NULL ) {
+			rc = LDAP_PROTOCOL_ERROR;
+			goto done;
+		}
 	}
 
 	/* Grab the searchbase */
 	bv.bv_val = ludp->lud_dn;
 	bv.bv_len = strlen( bv.bv_val );
-	rc = dnNormalize2( NULL, &bv, searchbase );
+	rc = dnNormalize2( NULL, &bv, searchbase, op->o_tmpmemctx );
 
-	ldap_free_urldesc( ludp );
+done:
+	if( rc != LDAP_SUCCESS ) {
+		if( *filter ) filter_free_x( op, *filter );
+	}
 
+	ldap_free_urldesc( ludp );
 	return( rc );
 }
 
-
-int slap_sasl_regexp_config( const char *match, const char *replace )
+static int slap_sasl_rx_off(char *rep, int *off)
 {
-#ifdef HAVE_CYRUS_SASL
 	const char *c;
-	int rc, n;
-	SaslRegexp_t *reg;
-	struct berval bv, nbv;
-
-	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 ));
-#else
-		Debug( LDAP_DEBUG_ANY,
-		"SASL match pattern %s could not be normalized.\n",
-		match, 0, 0 );
-#endif
-		return( rc );
-	}
-	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 );
-	}
-	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
-
-		return( LDAP_OPERATIONS_ERROR );
-	}
+	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 int slap_sasl_regexp( struct berval *in, struct berval *out )
+int slap_sasl_regexp_config( const char *match, const char *replace )
 {
-	char *saslname = in->bv_val;
-	int i, n, len, insert;
+	int rc;
 	SaslRegexp_t *reg;
 
-	out->bv_val = NULL;
-	out->bv_len = 0;
+	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( 0 );
-
-	/* 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( 0 );
+	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++;
 	}
-	out->bv_val = 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( out->bv_val+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( out->bv_val+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++;
 	}
 
 	out->bv_val[insert] = '\0';
-#ifdef NEW_LOGGING
-	LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-		"slap_sasl_regexp: converted SASL name to %s\n", out->bv_val ));
-#else
-	Debug( LDAP_DEBUG_TRACE,
-	   "slap_sasl_regexp: converted SASL name to %s\n", out->bv_val, 0, 0 );
-#endif
-
-	return( 1 );
-}
-
-/* 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)
-{
 }
 
-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)
-{
-}
+/* 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) */
 
-/* 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)
+static int slap_sasl_regexp( struct berval *in, struct berval *out, void *ctx )
 {
-	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;
+	int i;
 
-void slap_sasl2dn( struct berval *saslname, struct berval *dn )
-{
-	struct berval uri = {0, 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 */
-	if( !slap_sasl_regexp( saslname, &uri ) )
-		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,
+		  reg->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,
+		reg->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.bv_val ) ch_free( uri.bv_val );
+	/* We only want to be called once */
+	if( ndn->bv_val ) {
+		o->o_tmpfree(ndn->bv_val, o->o_tmpmemctx);
+		ndn->bv_val = NULL;
 
 #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_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_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;
 }
 
 /*
@@ -448,91 +384,94 @@ static int sasl_sc_smatch( BackendDB *be, Connection *conn, Operation *o,
  */
 
 static
-int slap_sasl_match( struct berval *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, NULL };
+	slap_callback cb = { sasl_sc_smatch };
 	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->bv_val ));
+	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->bv_val, 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 )
-		goto CONCLUDED;
+	rc = slap_parseURI( opx, rule, &op.o_req_ndn, &op.oq_search.rs_scope, &op.oq_search.rs_filter );
+	if( rc != LDAP_SUCCESS ) goto CONCLUDED;
 
 	/* Massive shortcut: search scope == base */
-	if( scope == LDAP_SCOPE_BASE ) {
-		rc = regcomp(&reg, searchbase.bv_val,
+	if( op.oq_search.rs_scope == LDAP_SCOPE_BASE ) {
+		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;
 	}
 
 	/* Must run an internal search. */
 
 #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;
+	op.o_conn = opx->o_conn;
+	op.o_connid = opx->o_connid;
 
-	(*be->be_search)( be, /*conn=*/NULL, &op, /*base=*/NULL, &searchbase,
-	   scope, /*deref=*/1, /*sizelimit=*/0, /*time=*/0, filter, /*fstr=*/NULL,
-	   /*attrs=*/NULL, /*attrsonly=*/0 );
+	op.o_bd->be_search( &op, &rs );
 
-	ldap_pvt_thread_mutex_destroy( &op.o_abandonmutex );
-
-	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_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 );
+
 #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);
@@ -548,44 +487,36 @@ 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( Connection *conn,
+	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( conn->c_sasl_bindop, 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, authc );
-		if ( rc == LDAP_SUCCESS )
-			goto COMPLETE;
+		rc = slap_sasl_match( conn->c_sasl_bindop, &vals[i], assertDN, authc );
+		if ( rc == LDAP_SUCCESS ) goto COMPLETE;
 	}
 	rc = LDAP_INAPPROPRIATE_AUTH;
 
@@ -593,32 +524,132 @@ COMPLETE:
 	if( vals ) ber_bvarray_free( vals );
 
 #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 rc;
+	slap_callback cb = { sasl_sc_sasl2dn };
+	Operation op = {0};
+	SlapReply rs = {REP_RESULT};
+	struct berval regout = { 0, NULL };
 
-/* 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, opx->o_tmpmemctx ) ) {
+		goto FINISHED;
+	}
+
+	rc = slap_parseURI( opx, &regout, &op.o_req_ndn, &op.oq_search.rs_scope, &op.oq_search.rs_filter );
+	if( regout.bv_val ) sl_free( regout.bv_val, opx->o_tmpmemctx );
+	if( rc != LDAP_SUCCESS ) {
+		goto FINISHED;
+	}
+
+	/* Must do an internal search */
+	op.o_bd = select_backend( &op.o_req_ndn, 0, 1 );
+
+	/* Massive shortcut: search scope == base */
+	if( op.oq_search.rs_scope == LDAP_SCOPE_BASE ) {
+		*sasldn = op.o_req_ndn;
+		op.o_req_ndn.bv_len = 0;
+		op.o_req_ndn.bv_val = NULL;
+		goto FINISHED;
+	}
+
+#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;
+	op.oq_search.rs_deref = LDAP_DEREF_NEVER;
+	op.oq_search.rs_slimit = 1;
+	op.oq_search.rs_attrsonly = 1;
+
+	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_ndn.bv_len ) ch_free( op.o_req_ndn.bv_val );
+	if( op.oq_search.rs_filter ) filter_free_x( opx, op.oq_search.rs_filter );
+
+#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;
+}
 
-static struct berval sasl_authz_src = {
-	sizeof(SASL_AUTHZ_SOURCE_ATTR)-1, SASL_AUTHZ_SOURCE_ATTR };
 
-static struct berval sasl_authz_dst = {
-	sizeof(SASL_AUTHZ_DEST_ATTR)-1, SASL_AUTHZ_DEST_ATTR };
+/* Check if a bind can SASL authorize to another identity.
+ * The DNs should not have the dn: prefix
+ */
 
-int slap_sasl_authorized( struct berval *authcDN, struct berval *authzDN )
+int slap_sasl_authorized( Connection *conn,
+	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;
@@ -626,11 +657,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 */
@@ -639,28 +672,36 @@ 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( conn->c_authz_backend && be_isroot( conn->c_authz_backend, authcDN )) {
+		rc = LDAP_SUCCESS;
 		goto DONE;
 	}
 
+	/* Check source rules */
+	if( authz_policy & SASL_AUTHZ_TO ) {
+		rc = slap_sasl_check_authz( conn, authcDN, authzDN,
+			slap_schema.si_ad_saslAuthzTo, authcDN );
+		if( rc == LDAP_SUCCESS ) {
+			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( conn, 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 );