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 b2c4cecd3b261fd977f29ceaff3e791dbcfb27db..a479131c86034cdca21a9890a27bfd22070b3e90 100644 (file)
--- a/servers/slapd/back-ldap/modrdn.c
+++ b/servers/slapd/back-ldap/modrdn.c
@@ -1,25 +1,24 @@
 /* modrdn.c - ldap backend modrdn function */
 /* $OpenLDAP$ */
-
-/*
- * 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.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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
+ * 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>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by the Howard Chu for inclusion
+ * in OpenLDAP Software and subsequently enhanced by Pierangelo
+ * Masarati.
  */
 
 #include "portable.h"
@@ -34,33 +33,101 @@
 
 int
 ldap_back_modrdn(
-    Backend    *be,
-    Connection *conn,
     Operation  *op,
-    char       *dn,
-    char       *newrdn,
-    int                deleteoldrdn,
-    char       *newSuperior
-)
+    SlapReply  *rs )
 {
-       struct ldapinfo *li = (struct ldapinfo *) be->be_private;
+       struct ldapinfo *li = (struct ldapinfo *) op->o_bd->be_private;
        struct ldapconn *lc;
+       ber_int_t msgid;
+       dncookie dc;
+#ifdef LDAP_BACK_PROXY_AUTHZ 
+       LDAPControl **ctrls = NULL;
+       int rc = LDAP_SUCCESS;
+#endif /* LDAP_BACK_PROXY_AUTHZ */
 
-       lc = ldap_back_getconn( li, conn, op );
-       if (!lc)
+       struct berval mdn = { 0, NULL }, mnewSuperior = { 0, NULL };
+
+       lc = ldap_back_getconn( op, rs );
+       if ( !lc || !ldap_back_dobind(lc, op, rs) ) {
                return( -1 );
+       }
 
-       if (newSuperior) {
+       dc.rwmap = &li->rwmap;
+#ifdef ENABLE_REWRITE
+       dc.conn = op->o_conn;
+       dc.rs = rs;
+#else
+       dc.tofrom = 1;
+       dc.normalized = 0;
+#endif
+       if (op->orr_newSup) {
                int version = LDAP_VERSION3;
                ldap_set_option( lc->ld, LDAP_OPT_PROTOCOL_VERSION, &version);
+               
+               /*
+                * Rewrite the new superior, if defined and required
+                */
+#ifdef ENABLE_REWRITE
+               dc.ctx = "newSuperiorDN";
+#endif
+               if ( ldap_back_dn_massage( &dc, op->orr_newSup,
+                       &mnewSuperior ) ) {
+                       send_ldap_result( op, rs );
+                       return -1;
+               }
        }
 
-       if (!lc->bound) {
-               ldap_back_dobind(lc, op);
-               if (!lc->bound)
-                       return( -1 );
+       /*
+        * Rewrite the modrdn dn, if required
+        */
+#ifdef ENABLE_REWRITE
+       dc.ctx = "modrDN";
+#endif
+       if ( ldap_back_dn_massage( &dc, &op->o_req_ndn, &mdn ) ) {
+               send_ldap_result( op, rs );
+               return -1;
        }
 
-       ldap_rename2_s( lc->ld, dn, newrdn, deleteoldrdn, newSuperior );
-       return( ldap_back_op_result( lc, op ) );
+#ifdef LDAP_BACK_PROXY_AUTHZ
+       rc = ldap_back_proxy_authz_ctrl( lc, op, rs, &ctrls );
+       if ( rc != LDAP_SUCCESS ) {
+               goto cleanup;
+       }
+#endif /* LDAP_BACK_PROXY_AUTHZ */
+
+       rs->sr_err = ldap_rename( lc->ld, mdn.bv_val,
+                       op->orr_newrdn.bv_val, mnewSuperior.bv_val,
+                       op->orr_deleteoldrdn,
+#ifdef LDAP_BACK_PROXY_AUTHZ
+                       ctrls,
+#else /* ! LDAP_BACK_PROXY_AUTHZ */
+                       op->o_ctrls,
+#endif /* ! LDAP_BACK_PROXY_AUTHZ */
+                       NULL, &msgid );
+
+#ifdef LDAP_BACK_PROXY_AUTHZ
+cleanup:
+       if ( ctrls && ctrls != op->o_ctrls ) {
+               free( ctrls[ 0 ] );
+               free( ctrls );
+       }
+#endif /* LDAP_BACK_PROXY_AUTHZ */
+
+       if ( mdn.bv_val != op->o_req_ndn.bv_val ) {
+               free( mdn.bv_val );
+       }
+       if ( mnewSuperior.bv_val != NULL
+               && mnewSuperior.bv_val != op->oq_modrdn.rs_newSup->bv_val ) {
+               free( mnewSuperior.bv_val );
+       }
+
+#ifdef LDAP_BACK_PROXY_AUTHZ
+       if ( rc != LDAP_SUCCESS ) {
+               send_ldap_result( op, rs );
+               return -1;
+       }
+#endif /* LDAP_BACK_PROXY_AUTHZ */
+
+       return( ldap_back_op_result( lc, op, rs, msgid, 1 ) );
 }
+