X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslapauth.c;h=31c5361d4bdace9cd66537bba5731f63565207d5;hb=7ce9e7b7c637a69fa1fdd78cfdfbf2581bb8217e;hp=a01933b4b58d0a3b1bf0e3e5644c448f764d3793;hpb=7b65d46b1baa8ceead8c580988be74c1caef7a4b;p=openldap

diff --git a/servers/slapd/slapauth.c b/servers/slapd/slapauth.c
index a01933b4b5..31c5361d4b 100644
--- a/servers/slapd/slapauth.c
+++ b/servers/slapd/slapauth.c
@@ -1,6 +1,6 @@
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2004 The OpenLDAP Foundation.
+ * Copyright 2004-2006 The OpenLDAP Foundation.
  * Portions Copyright 2004 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -40,7 +40,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,
@@ -79,26 +79,24 @@ slapauth( int argc, char **argv )
 {
 	int			rc = EXIT_SUCCESS;
 	const char		*progname = "slapauth";
-	Connection		conn;
-	Operation		op;
+	Connection		conn = {0};
+	OperationBuffer	opbuf;
+	Operation		*op;
 
-#ifdef NEW_LOGGING
-	lutil_log_initialize( argc, argv );
-#endif
 	slap_tool_init( progname, SLAPAUTH, argc, argv );
 
 	argv = &argv[ optind ];
 	argc -= optind;
 
-	memset( &conn, 0, sizeof( Connection ) );
-	memset( &op, 0, sizeof( Operation ) );
+	op = (Operation *) &opbuf;
+	connection_fake_init( &conn, op, &conn );
 
-	connection_fake_init( &conn, &op, &conn );
+	conn.c_sasl_bind_mech = mech;
 
 	if ( !BER_BVISNULL( &authzID ) ) {
 		struct berval	authzdn;
 		
-		rc = slap_sasl_getdn( &conn, &op, &authzID, NULL, &authzdn,
+		rc = slap_sasl_getdn( &conn, op, &authzID, NULL, &authzdn,
 				SLAP_GETDN_AUTHZID );
 		if ( rc != LDAP_SUCCESS ) {
 			fprintf( stderr, "authzID: <%s> check failed %d (%s)\n",
@@ -115,7 +113,7 @@ slapauth( int argc, char **argv )
 
 	if ( !BER_BVISNULL( &authcID ) ) {
 		if ( !BER_BVISNULL( &authzID ) || argc == 0 ) {
-			rc = do_check( &conn, &op, &authcID );
+			rc = do_check( &conn, op, &authcID );
 			goto destroy;
 		}
 
@@ -124,25 +122,27 @@ slapauth( int argc, char **argv )
 		
 			ber_str2bv( argv[ 0 ], 0, 0, &authzID );
 
-			rc = slap_sasl_getdn( &conn, &op, &authzID, NULL, &authzdn,
+			rc = slap_sasl_getdn( &conn, op, &authzID, NULL, &authzdn,
 					SLAP_GETDN_AUTHZID );
 			if ( rc != LDAP_SUCCESS ) {
 				fprintf( stderr, "authzID: <%s> check failed %d (%s)\n",
 						authzID.bv_val, rc,
 						ldap_err2string( rc ) );
-				rc = 1;
+				rc = -1;
 				BER_BVZERO( &authzID );
-				goto destroy;
+				if ( !continuemode ) {
+					goto destroy;
+				}
 			}
 
 			authzID = authzdn;
 
-			rc = do_check( &conn, &op, &authcID );
+			rc = do_check( &conn, op, &authcID );
 
-			op.o_tmpfree( authzID.bv_val, op.o_tmpmemctx );
+			op->o_tmpfree( authzID.bv_val, op->o_tmpmemctx );
 			BER_BVZERO( &authzID );
 
-			if ( rc ) {
+			if ( rc && !continuemode ) {
 				goto destroy;
 			}
 		}
@@ -155,16 +155,16 @@ slapauth( int argc, char **argv )
 
 		ber_str2bv( argv[ 0 ], 0, 0, &id );
 
-		rc = do_check( &conn, &op, &id );
+		rc = do_check( &conn, op, &id );
 
-		if ( rc ) {
+		if ( rc && !continuemode ) {
 			goto destroy;
 		}
 	}
 
 destroy:;
 	if ( !BER_BVISNULL( &authzID ) ) {
-		op.o_tmpfree( authzID.bv_val, op.o_tmpmemctx );
+		op->o_tmpfree( authzID.bv_val, op->o_tmpmemctx );
 	}
 	slap_tool_destroy();