/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2005 The OpenLDAP Foundation.
* Portions Copyright 1999-2003 Howard Chu.
* Portions Copyright 2000-2003 Pierangelo Masarati.
* All rights reserved.
* <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.
*/
/* 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 *dn,
- struct berval *res
+ struct berval *in,
+ struct berval *dn
)
{
- int rc = 0;
+ int rc = 0;
+ struct berval mdn;
+ static char *dmy = "";
+
+ assert( dc );
+ assert( in );
+ assert( dn );
rc = rewrite_session( dc->rwmap->rwm_rw, dc->ctx,
- ( dn->bv_len ? dn->bv_val : "" ),
- dc->conn, &res->bv_val );
+ ( in->bv_val ? in->bv_val : dmy ),
+ dc->conn, &mdn.bv_val );
switch ( rc ) {
case REWRITE_REGEXEC_OK:
- if ( res->bv_val != NULL ) {
- res->bv_len = strlen( res->bv_val );
+ if ( !BER_BVISNULL( &mdn ) && mdn.bv_val != in->bv_val ) {
+ mdn.bv_len = strlen( mdn.bv_val );
+ *dn = mdn;
} else {
- *res = *dn;
+ *dn = *in;
}
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_LDAP, DETAIL1,
- "[rw] %s: \"%s\" -> \"%s\"\n",
- dc->ctx, dn->bv_val, res->bv_val );
-#else /* !NEW_LOGGING */
+ rc = LDAP_SUCCESS;
+
Debug( LDAP_DEBUG_ARGS,
"[rw] %s: \"%s\" -> \"%s\"\n",
- dc->ctx, dn->bv_val, res->bv_val );
-#endif /* !NEW_LOGGING */
- rc = LDAP_SUCCESS;
+ dc->ctx, in->bv_val, dn->bv_val );
break;
case REWRITE_REGEXEC_UNWILLING:
break;
}
+ if ( mdn.bv_val == dmy ) {
+ BER_BVZERO( &mdn );
+ }
+
return rc;
}
-#else
+#else /* ! ENABLE_REWRITE */
/*
* rwm_dn_massage
*
int
rwm_dn_massage(
dncookie *dc,
- struct berval *odn,
- struct berval *res
+ struct berval *in,
+ struct berval *dn
)
{
- int i, src, dst;
- struct berval pretty = {0,NULL}, *dn = odn;
+ int i, src, dst;
+ struct berval tmpin;
- assert( res );
+ assert( dc );
+ assert( in );
+ assert( dn );
- if ( dn == NULL ) {
- res->bv_val = NULL;
- res->bv_len = 0;
- return 0;
+ BER_BVZERO( dn );
+
+ if ( BER_BVISNULL( in ) ) {
+ return LDAP_SUCCESS;
}
+
if ( dc->rwmap == NULL || dc->rwmap->rwm_suffix_massage == NULL ) {
- *res = *dn;
- return 0;
+ *dn = *in;
+ return LDAP_SUCCESS;
}
if ( dc->tofrom ) {
src = 0 + dc->normalized;
dst = 2 + dc->normalized;
+
+ tmpin = *in;
+
} else {
+ int rc;
+
src = 2 + dc->normalized;
dst = 0 + dc->normalized;
+
/* DN from remote server may be in arbitrary form.
* Pretty it so we can parse reliably.
*/
- dnPretty( NULL, dn, &pretty, NULL );
- if (pretty.bv_val) dn = &pretty;
+ if ( dc->normalized ) {
+ rc = dnNormalize( 0, NULL, NULL, in, &tmpin, NULL );
+
+ } else {
+ rc = dnPretty( NULL, in, &tmpin, NULL );
+ }
+
+ if ( rc != LDAP_SUCCESS ) {
+ return rc;
+ }
}
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 = dn->bv_len - aliasLength;
+ int diff = tmpin.bv_len - aliasLength;
if ( diff < 0 ) {
/* alias is longer than dn */
continue;
- } else if ( diff > 0 && ( !DN_SEPARATOR(dn->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 */
/* At a DN Separator */
}
- if ( !strcmp( dc->rwmap->rwm_suffix_massage[i+src].bv_val, &dn->bv_val[diff] ) ) {
- res->bv_len = diff + dc->rwmap->rwm_suffix_massage[i+dst].bv_len;
- res->bv_val = ch_malloc( res->bv_len + 1 );
- strncpy( res->bv_val, dn->bv_val, diff );
- strcpy( &res->bv_val[diff], dc->rwmap->rwm_suffix_massage[i+dst].bv_val );
-#ifdef NEW_LOGGING
- LDAP_LOG ( BACK_LDAP, ARGS,
- "rwm_dn_massage: converted \"%s\" to \"%s\"\n",
- dn->bv_val, res->bv_val, 0 );
-#else
+ 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",
- dn->bv_val, res->bv_val, 0 );
-#endif
+ in->bv_val, dn->bv_val, 0 );
+
break;
}
}
- if (pretty.bv_val) {
- ch_free(pretty.bv_val);
- dn = odn;
+
+ if ( tmpin.bv_val != in->bv_val ) {
+ ch_free( tmpin.bv_val );
}
+
/* Nothing matched, just return the original DN */
- if (res->bv_val == NULL) {
- *res = *dn;
+ if ( BER_BVISNULL( dn ) ) {
+ *dn = *in;
}
- return 0;
+ return LDAP_SUCCESS;
}
-#endif /* !ENABLE_REWRITE */
+#endif /* ! ENABLE_REWRITE */
#endif /* SLAPD_OVER_RWM */
projects / openldap / blobdiff