X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslapauth.c;h=9b82e7db7079a53c4a9f0a61abc12289be64f9fb;hb=850e4ae0d3a159f7d38e25ff13e5ecfb2842eb57;hp=73b2ceb93da12d5e7509ce91d998fa06af863251;hpb=5f99f7c991e57cb305c4d2871fbe84dbb6eebb0e;p=openldap

diff --git a/servers/slapd/slapauth.c b/servers/slapd/slapauth.c
index 73b2ceb93d..9b82e7db70 100644
--- a/servers/slapd/slapauth.c
+++ b/servers/slapd/slapauth.c
@@ -1,6 +1,7 @@
+/* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2004 The OpenLDAP Foundation.
+ * Copyright 2004-2009 The OpenLDAP Foundation.
  * Portions Copyright 2004 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -40,7 +41,7 @@ do_check( Connection *c, Operation *op, struct berval *id )
 	struct berval	authcdn;
 	int		rc;
 
-	rc = slap_sasl_getdn( c, op, id, NULL, &authcdn, SLAP_GETDN_AUTHCID );
+	rc = slap_sasl_getdn( c, op, id, realm, &authcdn, SLAP_GETDN_AUTHCID );
 	if ( rc != LDAP_SUCCESS ) {
 		fprintf( stderr, "ID: <%s> check failed %d (%s)\n",
 				id->bv_val, rc,
@@ -80,16 +81,20 @@ slapauth( int argc, char **argv )
 	int			rc = EXIT_SUCCESS;
 	const char		*progname = "slapauth";
 	Connection		conn = {0};
-	char			opbuf[OPERATION_BUFFER_SIZE];
+	OperationBuffer	opbuf;
 	Operation		*op;
+	void			*thrctx;
 
 	slap_tool_init( progname, SLAPAUTH, argc, argv );
 
 	argv = &argv[ optind ];
 	argc -= optind;
 
-	op = (Operation *)opbuf;
-	connection_fake_init( &conn, op, &conn );
+	thrctx = ldap_pvt_thread_pool_context();
+	connection_fake_init( &conn, &opbuf, thrctx );
+	op = &opbuf.ob_op;
+
+	conn.c_sasl_bind_mech = mech;
 
 	if ( !BER_BVISNULL( &authzID ) ) {
 		struct berval	authzdn;
@@ -164,7 +169,8 @@ destroy:;
 	if ( !BER_BVISNULL( &authzID ) ) {
 		op->o_tmpfree( authzID.bv_val, op->o_tmpmemctx );
 	}
-	slap_tool_destroy();
+	if ( slap_tool_destroy())
+		rc = EXIT_FAILURE;
 
 	return rc;
 }