X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foverlays%2Frwmdn.c;h=9348c70f119ad1cfa80e1fc44af7b6ebdcc36e53;hb=fb2e448e877a8a387084dde517362c9f7bf1b6b7;hp=e867ce936186105235c2db9efcca0b4444390848;hpb=d611a4b49a00238ed32ae84c68f27c6a0ef2273a;p=openldap

diff --git a/servers/slapd/overlays/rwmdn.c b/servers/slapd/overlays/rwmdn.c
index e867ce9361..9348c70f11 100644
--- a/servers/slapd/overlays/rwmdn.c
+++ b/servers/slapd/overlays/rwmdn.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2007 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Howard Chu.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
@@ -16,7 +16,7 @@
  * <http://www.OpenLDAP.org/license.html>.
  */
 /* ACKNOWLEDGEMENTS:
- * This work was initially developed by the Howard Chu for inclusion
+ * This work was initially developed by Howard Chu for inclusion
  * in OpenLDAP Software and subsequently enhanced by Pierangelo
  * Masarati.
  */
@@ -36,64 +36,149 @@
 
 /* FIXME: after rewriting, we should also remap attributes ...  */
 
+/*
+ * massages "in" and normalizes it into "ndn"
+ *
+ * "ndn" may be untouched if no massaging occurred and its value was not null
+ */
+int
+rwm_dn_massage_normalize(
+	dncookie *dc,
+	struct berval *in,
+	struct berval *ndn )
+{
+	int		rc;
+	struct berval	mdn = BER_BVNULL;
+	
+	/* massage and normalize a DN */
+	rc = rwm_dn_massage( dc, in, &mdn );
+	if ( rc != LDAP_SUCCESS ) {
+		return rc;
+	}
+
+	if ( mdn.bv_val == in->bv_val && !BER_BVISNULL( ndn ) ) {
+		return rc;
+	}
+
+	rc = dnNormalize( 0, NULL, NULL, &mdn, ndn, NULL );
+
+	if ( mdn.bv_val != in->bv_val ) {
+		ch_free( mdn.bv_val );
+	}
+
+	return rc;
+}
+
+/*
+ * massages "in" and prettifies it into "pdn"
+ *
+ * "pdn" may be untouched if no massaging occurred and its value was not null
+ */
+int
+rwm_dn_massage_pretty(
+	dncookie *dc,
+	struct berval *in,
+	struct berval *pdn )
+{
+	int		rc;
+	struct berval	mdn = BER_BVNULL;
+	
+	/* massage and pretty a DN */
+	rc = rwm_dn_massage( dc, in, &mdn );
+	if ( rc != LDAP_SUCCESS ) {
+		return rc;
+	}
+
+	if ( mdn.bv_val == in->bv_val && !BER_BVISNULL( pdn ) ) {
+		return rc;
+	}
+
+	rc = dnPretty( NULL, &mdn, pdn, NULL );
+
+	if ( mdn.bv_val != in->bv_val ) {
+		ch_free( mdn.bv_val );
+	}
+
+	return rc;
+}
+
+/*
+ * massages "in" and prettifies and normalizes it into "pdn" and "ndn"
+ *
+ * "pdn" may be untouched if no massaging occurred and its value was not null;
+ * "ndn" may be untouched if no massaging occurred and its value was not null;
+ * if no massage occurred and "ndn" value was not null, it is filled
+ * with the normaized value of "pdn", much like ndn = dnNormalize( pdn )
+ */
+int
+rwm_dn_massage_pretty_normalize(
+	dncookie *dc,
+	struct berval *in,
+	struct berval *pdn,
+	struct berval *ndn )
+{
+	int		rc;
+	struct berval	mdn = BER_BVNULL;
+	
+	/* massage, pretty and normalize a DN */
+	rc = rwm_dn_massage( dc, in, &mdn );
+	if ( rc != LDAP_SUCCESS ) {
+		return rc;
+	}
+
+	if ( mdn.bv_val == in->bv_val && !BER_BVISNULL( pdn ) ) {
+		if ( BER_BVISNULL( ndn ) ) {
+			rc = dnNormalize( 0, NULL, NULL, &mdn, ndn, NULL );
+		}
+		return rc;
+	}
+
+	rc = dnPrettyNormal( NULL, &mdn, pdn, ndn, NULL );
+
+	if ( mdn.bv_val != in->bv_val ) {
+		ch_free( mdn.bv_val );
+	}
+
+	return rc;
+}
+
 #ifdef ENABLE_REWRITE
+/*
+ * massages "in" into "dn"
+ * 
+ * "dn" may contain the value of "in" if no massage occurred
+ */
 int
 rwm_dn_massage(
 	dncookie *dc,
 	struct berval *in,
-	struct berval *dn,
-	struct berval *ndn
+	struct berval *dn
 )
 {
 	int		rc = 0;
 	struct berval	mdn;
+	static char	*dmy = "";
 
-	assert( in );
-
-	if ( dn == NULL && ndn == NULL ) {
-		return LDAP_OTHER;
-	}
+	assert( dc != NULL );
+	assert( in != NULL );
+	assert( dn != NULL );
 
 	rc = rewrite_session( dc->rwmap->rwm_rw, dc->ctx,
-			( in->bv_len ? in->bv_val : "" ), 
+			( in->bv_val ? in->bv_val : dmy ), 
 			dc->conn, &mdn.bv_val );
 	switch ( rc ) {
 	case REWRITE_REGEXEC_OK:
-		if ( !BER_BVISNULL( &mdn ) ) {
-
+		if ( !BER_BVISNULL( &mdn ) && mdn.bv_val != in->bv_val ) {
 			mdn.bv_len = strlen( mdn.bv_val );
-			
-			if ( dn != NULL && ndn != NULL ) {
-				rc = dnPrettyNormal( NULL, &mdn, dn, ndn, NULL );
-
-			} else if ( dn != NULL ) {
-				rc = dnPretty( NULL, &mdn, dn, NULL );
-
-			} else if ( ndn != NULL) {
-				rc = dnNormalize( 0, NULL, NULL, &mdn, ndn, NULL );
-			}
-
-			if ( mdn.bv_val != in->bv_val ) {
-				ch_free( mdn.bv_val );
-			}
-
+			*dn = mdn;
 		} else {
-			/* we assume the input string is already in pretty form,
-			 * and that the normalized version is already available */
-			if ( dn ) {
-				*dn = *in;
-				if ( ndn ) {
-					BER_BVZERO( ndn );
-				}
-			} else {
-				*ndn = *in;
-			}
-			rc = LDAP_SUCCESS;
+			*dn = *in;
 		}
+		rc = LDAP_SUCCESS;
 
 		Debug( LDAP_DEBUG_ARGS,
 			"[rw] %s: \"%s\" -> \"%s\"\n",
-			dc->ctx, in->bv_val, dn ? dn->bv_val : ndn->bv_val );
+			dc->ctx, in->bv_val, dn->bv_val );
 		break;
  		
  	case REWRITE_REGEXEC_UNWILLING:
@@ -113,10 +198,18 @@ rwm_dn_massage(
 		break;
 	}
 
+	if ( mdn.bv_val == dmy ) {
+		BER_BVZERO( &mdn );
+	}
+
+	if ( dn->bv_val == dmy ) {
+		BER_BVZERO( dn );
+	}
+
 	return rc;
 }
 
-#else
+#else /* ! ENABLE_REWRITE */
 /*
  * rwm_dn_massage
  * 
@@ -125,39 +218,25 @@ rwm_dn_massage(
 int
 rwm_dn_massage(
 	dncookie *dc,
-	struct berval *tmpin,
-	struct berval *dn,
-	struct berval *ndn
+	struct berval *in,
+	struct berval *dn
 )
 {
 	int     	i, src, dst;
-	struct berval	pretty = BER_BVNULL,
-			normal = BER_BVNULL,
-			*in = tmpin;
+	struct berval	tmpin;
 
-	if ( dn == NULL && ndn == NULL ) {
-		return LDAP_OTHER;
-	}
+	assert( dc != NULL );
+	assert( in != NULL );
+	assert( dn != NULL );
 
-	if ( in == NULL || BER_BVISNULL( in ) ) {
-		if ( dn ) {
-			BER_BVZERO( dn );
-		}
-		if ( ndn ) {
-			BER_BVZERO( ndn );
-		}
+	BER_BVZERO( dn );
+
+	if ( BER_BVISNULL( in ) ) {
 		return LDAP_SUCCESS;
 	}
 
 	if ( dc->rwmap == NULL || dc->rwmap->rwm_suffix_massage == NULL ) {
-		if ( dn ) {
-			*dn = *in;
-			if ( ndn ) {
-				BER_BVZERO( ndn );
-			}
-		} else {
-			*ndn = *in;
-		}
+		*dn = *in;
 		return LDAP_SUCCESS;
 	}
 
@@ -165,6 +244,8 @@ rwm_dn_massage(
 		src = 0 + dc->normalized;
 		dst = 2 + dc->normalized;
 
+		tmpin = *in;
+
 	} else {
 		int	rc;
 
@@ -174,39 +255,31 @@ rwm_dn_massage(
 		/* DN from remote server may be in arbitrary form.
 		 * Pretty it so we can parse reliably.
 		 */
-		if ( dc->normalized && dn == NULL ) {
-			rc = dnNormalize( 0, NULL, NULL, in, &normal, NULL );
-
-		} else if ( !dc->normalized && ndn == NULL ) {
-			rc = dnPretty( NULL, in, &pretty, NULL );
+		if ( dc->normalized ) {
+			rc = dnNormalize( 0, NULL, NULL, in, &tmpin, NULL );
 
 		} else {
-			rc = dnPrettyNormal( NULL, in, &pretty, &normal, NULL );
+			rc = dnPretty( NULL, in, &tmpin, NULL );
 		}
 
 		if ( rc != LDAP_SUCCESS ) {
 			return rc;
 		}
-
-		if ( dc->normalized && !BER_BVISNULL( &normal ) ) {
-			in = &normal;
-
-		} else if ( !dc->normalized && !BER_BVISNULL( &pretty ) ) {
-			in = &pretty;
-		}
 	}
 
 	for ( i = 0;
-		dc->rwmap->rwm_suffix_massage[i].bv_val != NULL;
-		i += 4 ) {
+			!BER_BVISNULL( &dc->rwmap->rwm_suffix_massage[i] );
+			i += 4 )
+	{
 		int aliasLength = dc->rwmap->rwm_suffix_massage[i+src].bv_len;
-		int diff = in->bv_len - aliasLength;
+		int diff = tmpin.bv_len - aliasLength;
 
 		if ( diff < 0 ) {
 			/* alias is longer than dn */
 			continue;
 
-		} else if ( diff > 0 && ( !DN_SEPARATOR(in->bv_val[diff-1]))) {
+		} else if ( diff > 0 && ( !DN_SEPARATOR(tmpin.bv_val[diff-1])))
+		{
 			/* FIXME: DN_SEPARATOR() is intended to work
 			 * on a normalized/pretty DN, so that ';'
 			 * is never used as a DN separator */
@@ -214,50 +287,33 @@ rwm_dn_massage(
 			/* At a DN Separator */
 		}
 
-		if ( !strcmp( dc->rwmap->rwm_suffix_massage[i+src].bv_val, &in->bv_val[diff] ) ) {
-			struct berval	*out;
-
-			if ( dn ) {
-				out = dn;
-			} else {
-				out = ndn;
-			}
-			out->bv_len = diff + dc->rwmap->rwm_suffix_massage[i+dst].bv_len;
-			out->bv_val = ch_malloc( out->bv_len + 1 );
-			strncpy( out->bv_val, in->bv_val, diff );
-			strcpy( &out->bv_val[diff], dc->rwmap->rwm_suffix_massage[i+dst].bv_val );
+		if ( !strcmp( dc->rwmap->rwm_suffix_massage[i+src].bv_val,
+					&tmpin.bv_val[diff] ) )
+		{
+			dn->bv_len = diff + dc->rwmap->rwm_suffix_massage[i+dst].bv_len;
+			dn->bv_val = ch_malloc( dn->bv_len + 1 );
+			strncpy( dn->bv_val, tmpin.bv_val, diff );
+			strcpy( &dn->bv_val[diff], dc->rwmap->rwm_suffix_massage[i+dst].bv_val );
 			Debug( LDAP_DEBUG_ARGS,
 				"rwm_dn_massage:"
 				" converted \"%s\" to \"%s\"\n",
-				in->bv_val, out->bv_val, 0 );
-			if ( dn && ndn ) {
-				rc = dnNormalize( 0, NULL, NULL, dn, ndn, NULL );
-			}
+				in->bv_val, dn->bv_val, 0 );
 
 			break;
 		}
 	}
 
-	if ( !BER_BVISNULL( &pretty ) ) {
-		ch_free( pretty.bv_val );
-	}
-
-	if ( !BER_BVISNULL( &normal ) ) {
-		ch_free( normal.bv_val );
+	if ( tmpin.bv_val != in->bv_val ) {
+		ch_free( tmpin.bv_val );
 	}
 
-	in = tmpin;
-
 	/* Nothing matched, just return the original DN */
-	if ( dc->normalized && BER_BVISNULL( ndn ) ) {
-		*ndn = *in;
-
-	} else if ( !dc->normalized && BER_BVISNULL( dn ) ) {
+	if ( BER_BVISNULL( dn ) ) {
 		*dn = *in;
 	}
 
 	return LDAP_SUCCESS;
 }
-#endif /* !ENABLE_REWRITE */
+#endif /* ! ENABLE_REWRITE */
 
 #endif /* SLAPD_OVER_RWM */