document search disable feature (spin-off of limit on unchecked entries)

[openldap] / servers / slapd / referral.c

diff --git a/servers/slapd/referral.c b/servers/slapd/referral.c
index acc9b9c2c5f82b7d1b43a84422c14cfda6b6369e..a55d32d07b1fc661521c2be710b6128542468975 100644 (file)
--- a/servers/slapd/referral.c
+++ b/servers/slapd/referral.c
@@ -1,8 +1,17 @@
 /* referral.c - muck with referrals */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 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"
@@ -31,9 +40,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 +53,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 +68,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 +76,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 );
@@ -356,3 +365,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;
+}
+