X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldap%2Fmodrdn.c;h=8c7eee586999da39d18882f3c568f6dcee9f1738;hb=08059f1633bfd9d0a709761b026bdb8e4441c6e6;hp=455cbb9eee30c03fffca2e285cf66cc798b69aa6;hpb=6b413395fdb795be7a4564f17680d061202919a4;p=openldap diff --git a/servers/slapd/back-ldap/modrdn.c b/servers/slapd/back-ldap/modrdn.c index 455cbb9eee..8c7eee5869 100644 --- a/servers/slapd/back-ldap/modrdn.c +++ b/servers/slapd/back-ldap/modrdn.c @@ -1,7 +1,7 @@ /* modrdn.c - ldap backend modrdn function */ /* $OpenLDAP$ */ /* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* This is an altered version */ @@ -84,10 +84,9 @@ ldap_back_modrdn( mnewSuperior.bv_val = ( char * )newSuperior; } #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1, - "[rw] newSuperiorDn:" - " \"%s\" -> \"%s\"\n", - newSuperior, mnewSuperior.bv_val )); + LDAP_LOG( BACK_LDAP, DETAIL1, + "[rw] newSuperiorDn:" " \"%s\" -> \"%s\"\n", + newSuperior, mnewSuperior.bv_val, 0 ); #else /* !NEW_LOGGING */ Debug( LDAP_DEBUG_ARGS, "rw> newSuperiorDn:" " \"%s\" -> \"%s\"\n%s", @@ -102,7 +101,7 @@ ldap_back_modrdn( return( -1 ); case REWRITE_REGEXEC_ERR: - send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, + send_ldap_result( conn, op, LDAP_OTHER, NULL, "Operations error", NULL, NULL ); return( -1 ); @@ -125,8 +124,8 @@ ldap_back_modrdn( mdn.bv_val = ( char * )dn->bv_val; } #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1, - "[rw] modrDn: \"%s\" -> \"%s\"\n", dn->bv_val, mdn.bv_val )); + LDAP_LOG( BACK_LDAP, DETAIL1, + "[rw] modrDn: \"%s\" -> \"%s\"\n", dn->bv_val, mdn.bv_val, 0 ); #else /* !NEW_LOGGING */ Debug( LDAP_DEBUG_ARGS, "rw> modrDn: \"%s\" -> \"%s\"\n%s", dn->bv_val, mdn.bv_val, "" ); @@ -139,7 +138,7 @@ ldap_back_modrdn( return( -1 ); case REWRITE_REGEXEC_ERR: - send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, + send_ldap_result( conn, op, LDAP_OTHER, NULL, "Operations error", NULL, NULL ); return( -1 ); }