X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Freferral.c;h=85fd39b426b92086934dbc6f7915d53b85c6f8df;hb=0af650863210ae1faac95d7ca44bdeefa9e99843;hp=5ab81c9686c66e89803cdf86654566e243165c1f;hpb=f52cc9bab51e427afa3ed5d28be012d8da27a7a8;p=openldap diff --git a/servers/slapd/referral.c b/servers/slapd/referral.c index 5ab81c9686..85fd39b426 100644 --- a/servers/slapd/referral.c +++ b/servers/slapd/referral.c @@ -1,7 +1,7 @@ /* referral.c - muck with referrals */ /* $OpenLDAP$ */ /* - * Copyright 1998-2001 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -11,7 +11,6 @@ #include #include -#include #include #include #include @@ -27,24 +26,27 @@ */ static char * referral_dn_muck( const char * refDN, - const char * baseDN, - const char * targetDN ) + struct berval * baseDN, + struct berval * targetDN ) { - char *tmp; - char *nrefDN = NULL; - char *nbaseDN = NULL; - char *ntargetDN = NULL; + int rc; + struct berval bvin; + struct berval nrefDN = { 0, NULL }; + struct berval nbaseDN = { 0, NULL }; + struct berval ntargetDN = { 0, NULL }; if( !baseDN ) { /* no base, return target */ - return targetDN ? ch_strdup( targetDN ) : NULL; + return targetDN ? ch_strdup( targetDN->bv_val ) : NULL; } if( refDN ) { - nrefDN = dn_validate( tmp = ch_strdup( refDN ) ); - if( !nrefDN ) { + bvin.bv_val = (char *)refDN; + bvin.bv_len = strlen( refDN ); + + rc = dnPretty( NULL, &bvin, &nrefDN, NULL ); + if( rc != LDAP_SUCCESS ) { /* Invalid refDN */ - ch_free( tmp ); return NULL; } } @@ -54,71 +56,78 @@ static char * referral_dn_muck( * if refDN present return refDN * else return baseDN */ - return nrefDN ? nrefDN : ch_strdup( baseDN ); + return nrefDN.bv_len ? nrefDN.bv_val : ch_strdup( baseDN->bv_val ); } - ntargetDN = dn_validate( tmp = ch_strdup( targetDN ) ); - if( !ntargetDN ) { - ch_free( tmp ); - ch_free( nrefDN ); + rc = dnPretty( NULL, targetDN, &ntargetDN, NULL ); + if( rc != LDAP_SUCCESS ) { + /* Invalid targetDN */ + ch_free( nrefDN.bv_val ); return NULL; } - if( nrefDN ) { - nbaseDN = dn_validate( tmp = ch_strdup( baseDN ) ); - if( !nbaseDN ) { + if( nrefDN.bv_len ) { + rc = dnPretty( NULL, baseDN, &nbaseDN, NULL ); + if( rc != LDAP_SUCCESS ) { /* Invalid baseDN */ - ch_free( ntargetDN ); - ch_free( nrefDN ); - ch_free( tmp ); + ch_free( nrefDN.bv_val ); + ch_free( ntargetDN.bv_val ); return NULL; } - if( strcasecmp( nbaseDN, nrefDN ) == 0 ) { - ch_free( nrefDN ); - ch_free( nbaseDN ); - return ntargetDN; + if( dn_match( &nbaseDN, &nrefDN ) ) { + ch_free( nrefDN.bv_val ); + ch_free( nbaseDN.bv_val ); + return ntargetDN.bv_val; } { - /* - * FIXME: string based mucking - */ - char *muck; - size_t reflen, baselen, targetlen, mucklen; - - reflen = strlen( nrefDN ); - baselen = strlen( nbaseDN ); - targetlen = strlen( ntargetDN ); - - if( targetlen < baselen ) { - ch_free( nrefDN ); - ch_free( nbaseDN ); - return ntargetDN; + struct berval muck; + + if( ntargetDN.bv_len < nbaseDN.bv_len ) { + ch_free( nrefDN.bv_val ); + ch_free( nbaseDN.bv_val ); + return ntargetDN.bv_val; } - if( strcasecmp( &ntargetDN[targetlen-baselen], nbaseDN ) ) { + rc = strcasecmp( + &ntargetDN.bv_val[ntargetDN.bv_len-nbaseDN.bv_len], + nbaseDN.bv_val ); + if( rc ) { /* target not subordinate to base */ - ch_free( nrefDN ); - ch_free( nbaseDN ); - return ntargetDN; + ch_free( nrefDN.bv_val ); + ch_free( nbaseDN.bv_val ); + return ntargetDN.bv_val; } - mucklen = targetlen + reflen - baselen; - muck = ch_malloc( 1 + mucklen ); + muck.bv_len = ntargetDN.bv_len + nrefDN.bv_len - nbaseDN.bv_len; + muck.bv_val = SLAP_MALLOC( muck.bv_len + 1 ); + if( muck.bv_val == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, CRIT, + "referral_dn_muck: SLAP_MALLOC failed\n", 0, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "referral_dn_muck: SLAP_MALLOC failed\n", 0, 0, 0 ); +#endif + return NULL; + } - strncpy( muck, ntargetDN, targetlen-baselen ); - strcpy( &muck[targetlen-baselen], nrefDN ); + strncpy( muck.bv_val, ntargetDN.bv_val, + ntargetDN.bv_len-nbaseDN.bv_len ); + strcpy( &muck.bv_val[ntargetDN.bv_len-nbaseDN.bv_len], + nrefDN.bv_val ); - ch_free( nrefDN ); - ch_free( nbaseDN ); - ch_free( ntargetDN ); + ch_free( nrefDN.bv_val ); + ch_free( nbaseDN.bv_val ); + ch_free( ntargetDN.bv_val ); - return muck; + return muck.bv_val; } } - return ntargetDN; + ch_free( nrefDN.bv_val ); + return ntargetDN.bv_val; } @@ -147,9 +156,9 @@ int validate_global_referral( const char *url ) default: /* other error, bail */ #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, + LDAP_LOG( CONFIG, CRIT, "referral: invalid URL (%s): %s (%d)\n", - url, "" /* ldap_url_error2str(rc) */, rc )); + url, "" /* ldap_url_error2str(rc) */, rc ); #else Debug( LDAP_DEBUG_ANY, "referral: invalid URL (%s): %s (%d)\n", @@ -162,9 +171,7 @@ int validate_global_referral( const char *url ) if( lurl->lud_dn && *lurl->lud_dn ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "referral: URL (%s): contains DN\n", - url )); + LDAP_LOG( CONFIG, CRIT, "referral: URL (%s): contains DN\n", url, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "referral: URL (%s): contains DN\n", @@ -174,9 +181,8 @@ int validate_global_referral( const char *url ) } else if( lurl->lud_attrs ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "referral: URL (%s): requests attributes\n", - url )); + LDAP_LOG( CONFIG, CRIT, + "referral: URL (%s): requests attributes\n", url, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "referral: URL (%s): requests attributes\n", @@ -186,9 +192,8 @@ int validate_global_referral( const char *url ) } else if( lurl->lud_scope != LDAP_SCOPE_DEFAULT ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "referral: URL (%s): contains explicit scope\n", - url )); + LDAP_LOG( CONFIG, CRIT, + "referral: URL (%s): contains explicit scope\n", url, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "referral: URL (%s): contains explicit scope\n", @@ -198,9 +203,8 @@ int validate_global_referral( const char *url ) } else if( lurl->lud_filter ) { #ifdef NEW_LOGGING - LDAP_LOG(( "config", LDAP_LEVEL_CRIT, - "referral: URL (%s): contains explicit filter\n", - url )); + LDAP_LOG( CONFIG, CRIT, + "referral: URL (%s): contains explicit filter\n", url, 0, 0 ); #else Debug( LDAP_DEBUG_ANY, "referral: URL (%s): contains explicit filter\n", @@ -213,14 +217,14 @@ int validate_global_referral( const char *url ) return rc; } -BVarray referral_rewrite( - BVarray in, +BerVarray referral_rewrite( + BerVarray in, struct berval *base, struct berval *target, int scope ) { int i; - BVarray refs; + BerVarray refs; struct berval *iv, *jv; if( in == NULL ) return NULL; @@ -231,7 +235,17 @@ BVarray referral_rewrite( if( i < 1 ) return NULL; - refs = ch_malloc( (i+1) * sizeof( struct berval ) ); + refs = SLAP_MALLOC( (i+1) * sizeof( struct berval ) ); + if( refs == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, CRIT, + "referral_rewrite: SLAP_MALLOC failed\n", 0, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "referral_rewrite: SLAP_MALLOC failed\n", 0, 0, 0 ); +#endif + return NULL; + } for( iv=in,jv=refs; iv->bv_val != NULL ; iv++ ) { LDAPURLDesc *url; @@ -249,8 +263,7 @@ BVarray referral_rewrite( char *dn = url->lud_dn; url->lud_dn = referral_dn_muck( ( dn && *dn ) ? dn : NULL, - base ? base->bv_val : NULL, - target ? target->bv_val : NULL ); + base, target ); ldap_memfree( dn ); } @@ -278,14 +291,12 @@ BVarray referral_rewrite( } -BVarray get_entry_referrals( - Backend *be, - Connection *conn, +BerVarray get_entry_referrals( Operation *op, Entry *e ) { Attribute *attr; - BVarray refs; + BerVarray refs; unsigned i; struct berval *iv, *jv; @@ -301,7 +312,17 @@ BVarray get_entry_referrals( if( i < 1 ) return NULL; - refs = ch_malloc( (i + 1) * sizeof(struct berval)); + refs = SLAP_MALLOC( (i + 1) * sizeof(struct berval)); + if( refs == NULL ) { +#ifdef NEW_LOGGING + LDAP_LOG( OPERATION, CRIT, + "get_entry_referrals: SLAP_MALLOC failed\n", 0, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, + "get_entry_referrals: SLAP_MALLOC failed\n", 0, 0, 0 ); +#endif + return NULL; + } for( iv=attr->a_vals, jv=refs; iv->bv_val != NULL; iv++ ) { unsigned k; @@ -309,7 +330,7 @@ BVarray get_entry_referrals( /* trim the label */ for( k=0; kbv_len; k++ ) { - if( isspace(jv->bv_val[k]) ) { + if( isspace( (unsigned char) jv->bv_val[k] ) ) { jv->bv_val[k] = '\0'; jv->bv_len = k; break; @@ -335,3 +356,48 @@ BVarray get_entry_referrals( return refs; } + +int get_alias_dn( + Entry *e, + struct berval *ndn, + int *err, + const char **text ) +{ + Attribute *a; + AttributeDescription *aliasedObjectName + = slap_schema.si_ad_aliasedObjectName; + + a = attr_find( e->e_attrs, aliasedObjectName ); + + if( a == NULL ) { + /* + * there was an aliasedobjectname defined but no data. + */ + *err = LDAP_ALIAS_PROBLEM; + *text = "alias missing aliasedObjectName attribute"; + return -1; + } + + /* + * aliasedObjectName should be SINGLE-VALUED with a single value. + */ + if ( a->a_vals[0].bv_val == NULL ) { + /* + * there was an aliasedobjectname defined but no data. + */ + *err = LDAP_ALIAS_PROBLEM; + *text = "alias missing aliasedObjectName value"; + return -1; + } + + if( a->a_nvals[1].bv_val != NULL ) { + *err = LDAP_ALIAS_PROBLEM; + *text = "alias has multivalued aliasedObjectName"; + return -1; + } + + *ndn = a->a_nvals[0]; + + return 0; +} +