slight improvements; doesn't work yet

[openldap] / servers / slapd / referral.c

diff --git a/servers/slapd/referral.c b/servers/slapd/referral.c
index 503e1f4558b9237bc5cbd7c831caafe7f8795240..e9c99c895f9bff4d1474fd8c1ab5c0e01583b46b 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"
@@ -44,7 +53,7 @@ static char * referral_dn_muck(
                bvin.bv_val = (char *)refDN;
                bvin.bv_len = strlen( refDN );
 
-               rc = dnPretty2( NULL, &bvin, &nrefDN, NULL );
+               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, NULL );
+       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, NULL );
+               rc = dnPretty( NULL, baseDN, &nbaseDN, NULL );
                if( rc != LDAP_SUCCESS ) {
                        /* Invalid baseDN */
                        ch_free( nrefDN.bv_val );