ITS#3032: retry when GSSAPI creds are not available

[openldap] / servers / slapd / back-ldap / modrdn.c

diff --git a/servers/slapd/back-ldap/modrdn.c b/servers/slapd/back-ldap/modrdn.c
index cf5154560f4df01e1b45be5f563cb70c816410f6..a479131c86034cdca21a9890a27bfd22070b3e90 100644 (file)
--- a/servers/slapd/back-ldap/modrdn.c
+++ b/servers/slapd/back-ldap/modrdn.c
@@ -2,7 +2,9 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003 The OpenLDAP Foundation.
+ * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Portions Copyright 1999-2003 Howard Chu.
+ * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -18,36 +20,6 @@
  * in OpenLDAP Software and subsequently enhanced by Pierangelo
  * Masarati.
  */
-/* This is an altered version */
-/*
- * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
- * 
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
- * 
- * 1. The author is not responsible for the consequences of use of this
- *    software, no matter how awful, even if they arise from flaws in it.
- * 
- * 2. The origin of this software must not be misrepresented, either by
- *    explicit claim or by omission.  Since few users ever read sources,
- *    credits should appear in the documentation.
- * 
- * 3. Altered versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.  Since few users
- *    ever read sources, credits should appear in the documentation.
- * 
- * 4. This notice may not be removed or altered.
- *
- *
- *
- * Copyright 2000, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
- * 
- * This software is being modified by Pierangelo Masarati.
- * The previously reported conditions apply to the modified code as well.
- * Changes in the original code are highlighted where required.
- * Credits for the original code go to the author, Howard Chu.
- */
 
 #include "portable.h"
 
@@ -96,7 +68,7 @@ ldap_back_modrdn(
                 * Rewrite the new superior, if defined and required
                 */
 #ifdef ENABLE_REWRITE
-               dc.ctx = "newSuperiorDn";
+               dc.ctx = "newSuperiorDN";
 #endif
                if ( ldap_back_dn_massage( &dc, op->orr_newSup,
                        &mnewSuperior ) ) {
@@ -109,9 +81,9 @@ ldap_back_modrdn(
         * Rewrite the modrdn dn, if required
         */
 #ifdef ENABLE_REWRITE
-       dc.ctx = "modrDn";
+       dc.ctx = "modrDN";
 #endif
-       if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) {
+       if ( ldap_back_dn_massage( &dc, &op->o_req_ndn, &mdn ) ) {
                send_ldap_result( op, rs );
                return -1;
        }
@@ -141,7 +113,7 @@ cleanup:
        }
 #endif /* LDAP_BACK_PROXY_AUTHZ */
 
-       if ( mdn.bv_val != op->o_req_dn.bv_val ) {
+       if ( mdn.bv_val != op->o_req_ndn.bv_val ) {
                free( mdn.bv_val );
        }
        if ( mnewSuperior.bv_val != NULL