Fix LBER_ERROR vs. -1 confusion.

[openldap] / servers / slapd / suffixalias.c

diff --git a/servers/slapd/suffixalias.c b/servers/slapd/suffixalias.c
index dd6aa3a209851e6310fe05a4ec4161a7d8b81d28..e42279d09ae1022001a2f158dc61c99795d8a7cf 100644 (file)
--- a/servers/slapd/suffixalias.c
+++ b/servers/slapd/suffixalias.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1999-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1999-2003 The OpenLDAP Foundation, All Rights Reserved.
  *
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file in the top level
  * directory of this package.
@@ -40,10 +40,10 @@ void suffix_alias(
        dnLength = dn->bv_len;
 
        for ( i = 0;
-               be->be_suffixAlias != NULL && be->be_suffixAlias[i] != NULL;
+               be->be_suffixAlias != NULL && be->be_suffixAlias[i].bv_val != NULL;
                i += 2 )
        {
-               int aliasLength = be->be_suffixAlias[i]->bv_len;
+               int aliasLength = be->be_suffixAlias[i].bv_len;
                int diff = dnLength - aliasLength;
 
                if ( diff < 0 ) {
@@ -58,16 +58,16 @@ void suffix_alias(
                        /* XXX or an escaped separator... oh well */
                }
 
-               if (!strcmp(be->be_suffixAlias[i]->bv_val, &dn->bv_val[diff])) {
+               if (!strcmp(be->be_suffixAlias[i].bv_val, &dn->bv_val[diff])) {
                        char *oldDN = dn->bv_val;
-                       dn->bv_len = diff + be->be_suffixAlias[i+1]->bv_len;
+                       dn->bv_len = diff + be->be_suffixAlias[i+1].bv_len;
                        dn->bv_val = ch_malloc( dn->bv_len + 1 );
                        strncpy( dn->bv_val, oldDN, diff );
-                       strcpy( &dn->bv_val[diff], be->be_suffixAlias[i+1]->bv_val );
+                       strcpy( &dn->bv_val[diff], be->be_suffixAlias[i+1].bv_val );
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                                  "suffix_alias: converted \"%s\" to \"%s\"\n",
-                                  oldDN, dn->bv_val ));
+                       LDAP_LOG( OPERATION, INFO, 
+                               "suffix_alias: converted \"%s\" to \"%s\"\n",
+                               oldDN, dn->bv_val, 0 );
 #else
                        Debug( LDAP_DEBUG_ARGS,
                                "suffix_alias: converted \"%s\" to \"%s\"\n",