Diff for /servers/slapd/back-ldap/modrdn.c between versions 1.35 and 1.36

version 1.35, 2004/04/07 02:11:44 version 1.36, 2004/05/13 18:25:53
Line 1 Line 1
 /* modrdn.c - ldap backend modrdn function */  /* modrdn.c - ldap backend modrdn function */
 /* $OpenLDAP: pkg/ldap/servers/slapd/back-ldap/modrdn.c,v 1.34 2004/03/10 20:11:14 ando Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/back-ldap/modrdn.c,v 1.35 2004/04/07 02:11:44 kurt Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *   *
  * Copyright 1999-2004 The OpenLDAP Foundation.   * Copyright 1999-2004 The OpenLDAP Foundation.
Line 40  ldap_back_modrdn( Line 40  ldap_back_modrdn(
         struct ldapconn *lc;          struct ldapconn *lc;
         ber_int_t msgid;          ber_int_t msgid;
         dncookie dc;          dncookie dc;
 #ifdef LDAP_BACK_PROXY_AUTHZ   
         LDAPControl **ctrls = NULL;          LDAPControl **ctrls = NULL;
   #ifdef LDAP_BACK_PROXY_AUTHZ 
         int rc = LDAP_SUCCESS;          int rc = LDAP_SUCCESS;
 #endif /* LDAP_BACK_PROXY_AUTHZ */  #endif /* LDAP_BACK_PROXY_AUTHZ */
   
Line 88  ldap_back_modrdn( Line 88  ldap_back_modrdn(
                 return -1;                  return -1;
         }          }
   
           ctrls = op->o_ctrls;
 #ifdef LDAP_BACK_PROXY_AUTHZ  #ifdef LDAP_BACK_PROXY_AUTHZ
         rc = ldap_back_proxy_authz_ctrl( lc, op, rs, &ctrls );          rc = ldap_back_proxy_authz_ctrl( lc, op, rs, &ctrls );
         if ( rc != LDAP_SUCCESS ) {          if ( rc != LDAP_SUCCESS ) {
Line 98  ldap_back_modrdn( Line 99  ldap_back_modrdn(
         rs->sr_err = ldap_rename( lc->ld, mdn.bv_val,          rs->sr_err = ldap_rename( lc->ld, mdn.bv_val,
                         op->orr_newrdn.bv_val, mnewSuperior.bv_val,                          op->orr_newrdn.bv_val, mnewSuperior.bv_val,
                         op->orr_deleteoldrdn,                          op->orr_deleteoldrdn,
 #ifdef LDAP_BACK_PROXY_AUTHZ  
                         ctrls,                          ctrls,
 #else /* ! LDAP_BACK_PROXY_AUTHZ */  
                         op->o_ctrls,  
 #endif /* ! LDAP_BACK_PROXY_AUTHZ */  
                         NULL, &msgid );                          NULL, &msgid );
   
 #ifdef LDAP_BACK_PROXY_AUTHZ  #ifdef LDAP_BACK_PROXY_AUTHZ

Removed from v.1.35  
changed lines
  Added in v.1.36


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org