X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fbind.c;h=66a1adc521fdfcf9f86cd72e28324c6d9875345e;hb=4aa2a2869219880c9a76d9c0ae163a7ff7a51d4e;hp=a4a10047d19c11415aff8dfcbaf32cf3a27843a0;hpb=cc6fab319ebb776c94462df6bc23abc718ae6ad8;p=openldap

diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index a4a10047d1..66a1adc521 100644
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -33,29 +33,26 @@ do_bind(
     Operation	*op
 )
 {
-	BerElement	*ber = op->o_ber;
-	ber_int_t		version;
+	BerElement *ber = op->o_ber;
+	ber_int_t version;
 	ber_tag_t method;
-	char		*mech;
-	char		*dn;
-	char *ndn;
-	ber_tag_t	tag;
-	int			rc = LDAP_SUCCESS;
-	const char	*text;
-	struct berval	cred;
-	Backend		*be;
+	char *mech = NULL;
+	struct berval dn = { 0, NULL };
+	struct berval pdn = { 0, NULL };
+	struct berval ndn = { 0, NULL };
+	ber_tag_t tag;
+	int	rc = LDAP_SUCCESS;
+	const char *text;
+	struct berval cred = { 0, NULL };
+	Backend *be;
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, "do_bind: conn %d\n", conn->c_connid ));
+	LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+		"do_bind: conn %d\n", conn->c_connid ));
 #else
 	Debug( LDAP_DEBUG_TRACE, "do_bind\n", 0, 0, 0 );
 #endif
 
-	dn = NULL;
-	ndn = NULL;
-	mech = NULL;
-	cred.bv_val = NULL;
-
 	/*
 	 * Force to connection to "anonymous" until bind succeeds.
 	 */
@@ -63,14 +60,16 @@ do_bind(
 	connection2anonymous( conn );
 	ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
-	if ( op->o_dn != NULL ) {
-		free( op->o_dn );
-		op->o_dn = ch_strdup( "" );
+	if ( op->o_dn.bv_val != NULL ) {
+		free( op->o_dn.bv_val );
+		op->o_dn.bv_val = ch_strdup( "" );
+		op->o_dn.bv_len = 0;
 	}
 
-	if ( op->o_ndn != NULL ) {
-		free( op->o_ndn );
-		op->o_ndn = ch_strdup( "" );
+	if ( op->o_ndn.bv_val != NULL ) {
+		free( op->o_ndn.bv_val );
+		op->o_ndn.bv_val = ch_strdup( "" );
+		op->o_ndn.bv_len = 0;
 	}
 
 	/*
@@ -93,12 +92,12 @@ do_bind(
 	 *	}
 	 */
 
-	tag = ber_scanf( ber, "{iat" /*}*/, &version, &dn, &method );
+	tag = ber_scanf( ber, "{iot" /*}*/, &version, &dn, &method );
 
 	if ( tag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-			   "do_bind: conn %d  ber_scanf failed\n", conn->c_connid ));
+			"do_bind: conn %d  ber_scanf failed\n", conn->c_connid ));
 #else
 		Debug( LDAP_DEBUG_ANY, "bind: ber_scanf failed\n", 0, 0, 0 );
 #endif
@@ -145,21 +144,22 @@ do_bind(
 	if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-			   "do_bind: conn %d  get_ctrls failed\n", conn->c_connid ));
+			"do_bind: conn %d  get_ctrls failed\n", conn->c_connid ));
 #else
 		Debug( LDAP_DEBUG_ANY, "do_bind: get_ctrls failed\n", 0, 0, 0 );
 #endif
 		goto cleanup;
 	} 
 
-	ndn = ch_strdup( dn );
-
-	if ( dn_normalize( ndn ) == NULL ) {
+	rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn );
+	if ( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-			   "do_bind: conn %d  invalid dn (%s)\n", conn->c_connid, dn ));
+			"do_bind: conn %d  invalid dn (%s)\n",
+			conn->c_connid, dn.bv_val ));
 #else
-		Debug( LDAP_DEBUG_ANY, "bind: invalid dn (%s)\n", dn, 0, 0 );
+		Debug( LDAP_DEBUG_ANY, "bind: invalid dn (%s)\n",
+			dn.bv_val, 0, 0 );
 #endif
 		send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
 		    "invalid DN", NULL, NULL );
@@ -169,31 +169,35 @@ do_bind(
 	if( method == LDAP_AUTH_SASL ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "operation",	 LDAP_LEVEL_DETAIL1,
-			   "do_sasl_bind: conn %d  dn (%s) mech %s\n", conn->c_connid,
-			   dn, mech ));
+			"do_sasl_bind: conn %d  dn (%s) mech %s\n", conn->c_connid,
+			pdn.bv_val, mech ));
 #else
 		Debug( LDAP_DEBUG_TRACE, "do_sasl_bind: dn (%s) mech %s\n",
-			dn, mech, NULL );
+			pdn.bv_val, mech, NULL );
 #endif
+
 	} else {
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-			   "do_bind: conn %d  version=%ld dn=\"%s\" method=%ld\n",
-			   conn->c_connid, (unsigned long) version, dn, (unsigned long)method ));
+			"do_bind: conn %d  version=%ld dn=\"%s\" method=%ld\n",
+			conn->c_connid, (unsigned long) version,
+			pdn.bv_val, (unsigned long)method ));
 #else
-		Debug( LDAP_DEBUG_TRACE, "do_bind: version=%ld dn=\"%s\" method=%ld\n",
-			(unsigned long) version, dn, (unsigned long) method );
+		Debug( LDAP_DEBUG_TRACE,
+			"do_bind: version=%ld dn=\"%s\" method=%ld\n",
+			(unsigned long) version,
+			pdn.bv_val, (unsigned long) method );
 #endif
 	}
 
 	Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d BIND dn=\"%s\" method=%ld\n",
-	    op->o_connid, op->o_opid, ndn, (unsigned long) method, 0 );
+	    op->o_connid, op->o_opid, pdn.bv_val, (unsigned long) method, 0 );
 
 	if ( version < LDAP_VERSION_MIN || version > LDAP_VERSION_MAX ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-			   "do_bind: conn %d  unknown version = %ld\n",
-			   conn->c_connid, (unsigned long)version ));
+			"do_bind: conn %d  unknown version = %ld\n",
+			conn->c_connid, (unsigned long)version ));
 #else
 		Debug( LDAP_DEBUG_ANY, "do_bind: unknown version=%ld\n",
 			(unsigned long) version, 0, 0 );
@@ -202,7 +206,7 @@ do_bind(
 			NULL, "requested protocol version not supported", NULL, NULL );
 		goto cleanup;
 
-	} else if (( global_disallows & SLAP_DISALLOW_BIND_V2 ) &&
+	} else if (!( global_allows & SLAP_ALLOW_BIND_V2 ) &&
 		version < LDAP_VERSION3 )
 	{
 		send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
@@ -224,8 +228,8 @@ do_bind(
 		if ( version < LDAP_VERSION3 ) {
 #ifdef NEW_LOGGING
 			LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-				   "do_bind: conn %d  sasl with LDAPv%ld\n",
-				   conn->c_connid, (unsigned long)version ));
+				"do_bind: conn %d  sasl with LDAPv%ld\n",
+				conn->c_connid, (unsigned long)version ));
 #else
 			Debug( LDAP_DEBUG_ANY, "do_bind: sasl with LDAPv%ld\n",
 				(unsigned long) version, 0, 0 );
@@ -272,11 +276,17 @@ do_bind(
 		ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
 		edn = NULL;
-		rc = slap_sasl_bind( conn, op, dn, ndn, &cred, &edn, &ssf );
+		rc = slap_sasl_bind( conn, op,
+			&pdn, &ndn,
+			&cred, &edn, &ssf );
 
 		ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 		if( rc == LDAP_SUCCESS ) {
-			conn->c_dn = edn;
+			conn->c_dn.bv_val = edn;
+			if( edn != NULL ) {
+				conn->c_dn.bv_len = strlen( edn );
+				dnNormalize2( NULL, &conn->c_dn, &conn->c_ndn );
+			}
 			conn->c_authmech = conn->c_sasl_bind_mech;
 			conn->c_sasl_bind_mech = NULL;
 			conn->c_sasl_bind_in_progress = 0;
@@ -286,7 +296,7 @@ do_bind(
 				conn->c_ssf = ssf;
 			}
 
-			if( conn->c_dn != NULL ) {
+			if( conn->c_dn.bv_len != 0 ) {
 				ber_len_t max = sockbuf_max_incoming;
 				ber_sockbuf_ctrl( conn->c_sb,
 					LBER_SB_OPT_SET_MAX_INCOMING, &max );
@@ -322,18 +332,18 @@ do_bind(
 
 	if ( method == LDAP_AUTH_SIMPLE ) {
 		/* accept "anonymous" binds */
-		if ( cred.bv_len == 0 || ndn == NULL || *ndn == '\0' ) {
+		if ( cred.bv_len == 0 || ndn.bv_len == 0 ) {
 			rc = LDAP_SUCCESS;
 			text = NULL;
 
 			if( cred.bv_len &&
-				( global_disallows & SLAP_DISALLOW_BIND_ANON_CRED ))
+				!( global_allows & SLAP_ALLOW_BIND_ANON_CRED ))
 			{
 				/* cred is not empty, disallow */
 				rc = LDAP_INVALID_CREDENTIALS;
 
-			} else if ( ndn != NULL && *ndn != '\0' &&
-				( global_disallows & SLAP_DISALLOW_BIND_ANON_DN ))
+			} else if ( ndn.bv_len &&
+				!( global_allows & SLAP_ALLOW_BIND_ANON_DN ))
 			{
 				/* DN is not empty, disallow */
 				rc = LDAP_UNWILLING_TO_PERFORM;
@@ -374,11 +384,11 @@ do_bind(
 #ifdef NEW_LOGGING
 			LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
 				   "do_bind: conn %d  v%d simple bind(%s) disallowed\n",
-				   conn->c_connid, version, ndn ));
+				   conn->c_connid, version, ndn.bv_val ));
 #else
 			Debug( LDAP_DEBUG_TRACE,
 				"do_bind: v%d simple bind(%s) disallowed\n",
-				version, ndn, 0 );
+				version, ndn.bv_val, 0 );
 #endif
 			goto cleanup;
 		}
@@ -412,11 +422,11 @@ do_bind(
 			NULL, text, NULL, NULL );
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-			   "do_bind: conn %d  v%d unknown authentication method (%d)\n",
+			   "do_bind: conn %ld  v%d unknown authentication method (%ld)\n",
 			   conn->c_connid, version, method ));
 #else
 		Debug( LDAP_DEBUG_TRACE,
-			"do_bind: v%d unknown authentication method (%d)\n",
+			"do_bind: v%d unknown authentication method (%ld)\n",
 			version, method, 0 );
 #endif
 		goto cleanup;
@@ -428,10 +438,15 @@ do_bind(
 	 * if we don't hold it.
 	 */
 
-	if ( (be = select_backend( ndn, 0 )) == NULL ) {
+	if ( (be = select_backend( &ndn, 0, 0 )) == NULL ) {
 		if ( default_referral ) {
+			BVarray ref = referral_rewrite( default_referral,
+				NULL, &pdn, LDAP_SCOPE_DEFAULT );
+
 			send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-				NULL, NULL, default_referral, NULL );
+				NULL, NULL, ref ? ref : default_referral, NULL );
+
+			bvarray_free( ref );
 
 		} else {
 			/* noSuchObject is not allowed to be returned by bind */
@@ -455,28 +470,31 @@ do_bind(
 	if ( be->be_bind ) {
 		int ret;
 		/* alias suffix */
-		char *edn = NULL;
+		struct berval edn = { 0, NULL };
 
 		/* deref suffix alias if appropriate */
-		ndn = suffix_alias( be, ndn );
+		suffix_alias( be, &ndn );
 
-		ret = (*be->be_bind)( be, conn, op, dn, ndn,
-			method, &cred, &edn );
+		ret = (*be->be_bind)( be, conn, op,
+			&pdn, &ndn, method, &cred, &edn );
 
 		if ( ret == 0 ) {
 			ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 
-			conn->c_cdn = dn;
-			dn = NULL;
-
-			if(edn != NULL) {
+			if(edn.bv_len) {
 				conn->c_dn = edn;
 			} else {
-				conn->c_dn = ndn;
-				ndn = NULL;
+				ber_dupbv( &conn->c_dn, &pdn );
 			}
+			conn->c_cdn = pdn.bv_val;
+			pdn.bv_val = NULL;
+			pdn.bv_len = 0;
 
-			if( conn->c_dn != NULL ) {
+			conn->c_ndn = ndn;
+			ndn.bv_val = NULL;
+			ndn.bv_len = 0;
+
+			if( conn->c_dn.bv_len != 0 ) {
 				ber_len_t max = sockbuf_max_incoming;
 				ber_sockbuf_ctrl( conn->c_sb,
 					LBER_SB_OPT_SET_MAX_INCOMING, &max );
@@ -484,11 +502,12 @@ do_bind(
 
 #ifdef NEW_LOGGING
 			LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
-				   "do_bind: conn %d  v%d bind: \"%s\" to \"%s\" \n",
-				   conn->c_connid, version, conn->c_cdn, conn->c_dn ));
+				"do_bind: conn %d  v%d bind: \"%s\" to \"%s\" \n",
+				conn->c_connid, version, conn->c_cdn, conn->c_dn.bv_val ));
 #else
-			Debug( LDAP_DEBUG_TRACE, "do_bind: v%d bind: \"%s\" to \"%s\"\n",
-			version, conn->c_cdn, conn->c_dn );
+			Debug( LDAP_DEBUG_TRACE,
+				"do_bind: v%d bind: \"%s\" to \"%s\"\n",
+				version, conn->c_cdn, conn->c_dn.bv_val );
 #endif
 
 			ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
@@ -497,21 +516,23 @@ do_bind(
 			send_ldap_result( conn, op, LDAP_SUCCESS,
 				NULL, NULL, NULL, NULL );
 
-		} else if (edn != NULL) {
-			free( edn );
+		} else if (edn.bv_val != NULL) {
+			free( edn.bv_val );
 		}
 
 	} else {
 		send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-			NULL, "operation not supported within namingContext", NULL, NULL );
+			NULL, "operation not supported within namingContext",
+			NULL, NULL );
 	}
 
 cleanup:
-	if( dn != NULL ) {
-		free( dn );
+	free( dn.bv_val );
+	if( pdn.bv_val != NULL ) {
+		free( pdn.bv_val );
 	}
-	if( ndn != NULL ) {
-		free( ndn );
+	if( ndn.bv_val != NULL ) {
+		free( ndn.bv_val );
 	}
 	if ( mech != NULL ) {
 		free( mech );