X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-perl%2Fmodrdn.c;h=a378bd1a23910493d1fab7a1d56eabb108a6d40d;hb=22df3f94e404e738640b6dc90eecef7e66c90966;hp=12808fdf5ee82093b4694cd5ac6eda9aa22d4615;hpb=654f21b2374610765c4846108728b4cd1e1c501d;p=openldap

diff --git a/servers/slapd/back-perl/modrdn.c b/servers/slapd/back-perl/modrdn.c
index 12808fdf5e..a378bd1a23 100644
--- a/servers/slapd/back-perl/modrdn.c
+++ b/servers/slapd/back-perl/modrdn.c
@@ -1,94 +1,66 @@
-/*
- *	 Copyright 1999, John C. Quillan, All rights reserved.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- *	 Redistribution and use in source and binary forms are permitted only
- *	 as authorized by the OpenLDAP Public License.	A copy of this
- *	 license is available at http://www.OpenLDAP.org/license.html or
- *	 in file LICENSE in the top-level directory of the distribution.
- */
-
-/*
- * LDAP v3 newSuperior support.
+ * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Portions Copyright 1999 John C. Quillan.
+ * Portions Copyright 2002 myinternet Limited.
+ * All rights reserved.
  *
- * Copyright 1999, Juan C. Gomez, All rights reserved.
- * This software is not subject to any license of Silicon Graphics 
- * Inc. or Purdue University.
- *
- * Redistribution and use in source and binary forms are permitted
- * without restriction or fee of any kind as long as this notice
- * is preserved.
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
-#include "portable.h"
-
-#include <stdio.h>
-/*	#include <ac/types.h>
-	#include <ac/socket.h>
-*/
-
-#include <EXTERN.h>
-#include <perl.h>
-
-#include "slap.h"
 #include "perl_back.h"
 
 int
 perl_back_modrdn(
-	Backend	*be,
-	Connection	*conn,
 	Operation	*op,
-	char	*dn,
-	char	*newrdn,
-	int		deleteoldrdn,
-	char	*newSuperior
-)
+	SlapReply	*rs )
 {
-	int len;
+	PerlBackend *perl_back = (PerlBackend *) op->o_bd->be_private;
 	int count;
-	int return_code;
-
-	PerlBackend *perl_back = (PerlBackend *) be->be_private;
 
 	ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );	
 
 	{
 		dSP; ENTER; SAVETMPS;
-
+		
 		PUSHMARK(sp) ;
 		XPUSHs( perl_back->pb_obj_ref );
-		XPUSHs(sv_2mortal(newSVpv( dn , 0 )));
-		XPUSHs(sv_2mortal(newSVpv( newrdn , 0 )));
-		XPUSHs(sv_2mortal(newSViv( deleteoldrdn )));
-		if ( newSuperior != NULL ) {
-			XPUSHs(sv_2mortal(newSVpv( newSuperior , 0 )));
+		XPUSHs(sv_2mortal(newSVpv( op->o_req_dn.bv_val , 0 )));
+		XPUSHs(sv_2mortal(newSVpv( op->orr_newrdn.bv_val , 0 )));
+		XPUSHs(sv_2mortal(newSViv( op->orr_deleteoldrdn )));
+		if ( op->orr_newSup != NULL ) {
+			XPUSHs(sv_2mortal(newSVpv( op->orr_newSup->bv_val , 0 )));
 		}
 		PUTBACK ;
 
+#ifdef PERL_IS_5_6
+		count = call_method("modrdn", G_SCALAR);
+#else
 		count = perl_call_method("modrdn", G_SCALAR);
+#endif
 
 		SPAGAIN ;
 
 		if (count != 1) {
-			croak("Big trouble in back_search\n") ;
+			croak("Big trouble in back_modrdn\n") ;
 		}
 							 
-		return_code = POPi;
+		rs->sr_err = POPi;
 
 		PUTBACK; FREETMPS; LEAVE ;
 	}
 
 	ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );
-
-	if( return_code != 0 ) {
-		send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
-
-	} else {
-		send_ldap_result( conn, op, LDAP_SUCCESS, "", "" );
-	}
+	
+	send_ldap_result( op, rs );
 
 	Debug( LDAP_DEBUG_ANY, "Perl MODRDN\n", 0, 0, 0 );
 	return( 0 );
 }
-
-