declare oc_bvfind_undef()

[openldap] / servers / slapd / referral.c

diff --git a/servers/slapd/referral.c b/servers/slapd/referral.c
index 57a46713a50571e025f7ab01fd474fe1af878ec0..039e1957f3c00554564c8e81be3e87fcf7e94d07 100644 (file)
--- a/servers/slapd/referral.c
+++ b/servers/slapd/referral.c
@@ -1,8 +1,17 @@
 /* referral.c - muck with referrals */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -16,8 +25,6 @@
 #include <ac/time.h>
 #include <ac/unistd.h>
 
-#include <ldap_pvt.h>
-
 #include "slap.h"
 
 /*
@@ -31,9 +38,9 @@ static char * referral_dn_muck(
 {
        int rc;
        struct berval bvin;
-       struct berval nrefDN = { 0, NULL };
-       struct berval nbaseDN = { 0, NULL };
-       struct berval ntargetDN = { 0, NULL };
+       struct berval nrefDN = BER_BVNULL;
+       struct berval nbaseDN = BER_BVNULL;
+       struct berval ntargetDN = BER_BVNULL;
 
        if( !baseDN ) {
                /* no base, return target */
@@ -44,7 +51,7 @@ static char * referral_dn_muck(
                bvin.bv_val = (char *)refDN;
                bvin.bv_len = strlen( refDN );
 
-               rc = dnPretty2( NULL, &bvin, &nrefDN );
+               rc = dnPretty( NULL, &bvin, &nrefDN, NULL );
                if( rc != LDAP_SUCCESS ) {
                        /* Invalid refDN */
                        return NULL;
@@ -59,7 +66,7 @@ static char * referral_dn_muck(
                return nrefDN.bv_len ? nrefDN.bv_val : ch_strdup( baseDN->bv_val );
        }
 
-       rc = dnPretty2( NULL, targetDN, &ntargetDN );
+       rc = dnPretty( NULL, targetDN, &ntargetDN, NULL );
        if( rc != LDAP_SUCCESS ) {
                /* Invalid targetDN */
                ch_free( nrefDN.bv_val );
@@ -67,7 +74,7 @@ static char * referral_dn_muck(
        }
 
        if( nrefDN.bv_len ) {
-               rc = dnPretty2( NULL, baseDN, &nbaseDN );
+               rc = dnPretty( NULL, baseDN, &nbaseDN, NULL );
                if( rc != LDAP_SUCCESS ) {
                        /* Invalid baseDN */
                        ch_free( nrefDN.bv_val );
@@ -103,13 +110,8 @@ static char * referral_dn_muck(
                        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;
                        }
 
@@ -155,61 +157,36 @@ int validate_global_referral( const char *url )
 
        default:
                /* other error, bail */
-#ifdef NEW_LOGGING
-               LDAP_LOG( CONFIG, CRIT, 
-                       "referral: invalid URL (%s): %s (%d)\n",
-                       url, "" /* ldap_url_error2str(rc) */, rc );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "referral: invalid URL (%s): %s (%d)\n",
                        url, "" /* ldap_url_error2str(rc) */, rc );
-#endif
                return 1;
        }
 
        rc = 0;
 
        if( lurl->lud_dn && *lurl->lud_dn ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( CONFIG, CRIT, "referral: URL (%s): contains DN\n", url, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "referral: URL (%s): contains DN\n",
                        url, 0, 0 );
-#endif
                rc = 1;
 
        } else if( lurl->lud_attrs ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG( CONFIG, CRIT, 
-                       "referral: URL (%s): requests attributes\n", url, 0, 0 );
-#else
                Debug( LDAP_DEBUG_ANY,
                        "referral: URL (%s): requests attributes\n",
                        url, 0, 0 );
-#endif
                rc = 1;
 
        } else if( lurl->lud_scope != LDAP_SCOPE_DEFAULT ) {
-#ifdef NEW_LOGGING
-               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",
                        url, 0, 0 );
-#endif
                rc = 1;
 
        } else if( lurl->lud_filter ) {
-#ifdef NEW_LOGGING
-               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",
                        url, 0, 0 );
-#endif
                rc = 1;
        }
 
@@ -237,13 +214,8 @@ BerVarray referral_rewrite(
 
        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;
        }
 
@@ -292,8 +264,6 @@ BerVarray referral_rewrite(
 
 
 BerVarray get_entry_referrals(
-       Backend *be,
-       Connection *conn,
        Operation *op,
        Entry *e )
 {
@@ -316,13 +286,8 @@ BerVarray get_entry_referrals(
 
        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;
        }
 
@@ -358,3 +323,48 @@ BerVarray 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;
+}
+