Add a safety check to bvcasechr

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

diff --git a/servers/slapd/back-perl/modrdn.c b/servers/slapd/back-perl/modrdn.c
index 32d9433af6cce16181b32923ae9a5742422c2caa..c2f6ff19e7e8d36ecdc8c0124caef5b096fa305e 100644 (file)
--- a/servers/slapd/back-perl/modrdn.c
+++ b/servers/slapd/back-perl/modrdn.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  *      Copyright 1999, John C. Quillan, All rights reserved.
  *
@@ -7,6 +8,19 @@
  *      in file LICENSE in the top-level directory of the distribution.
  */
 
+/*
+ * LDAP v3 newSuperior support.
+ *
+ * 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.
+ *
+ */
+
 #include "portable.h"
 
 #include <stdio.h>
@@ -25,9 +39,11 @@ perl_back_modrdn(
        Backend *be,
        Connection      *conn,
        Operation       *op,
-       char    *dn,
-       char    *newrdn,
-       int             deleteoldrdn
+       const char      *dn,
+       const char      *ndn,
+       const char      *newrdn,
+       int             deleteoldrdn,
+       const char      *newSuperior
 )
 {
        int len;
@@ -36,16 +52,19 @@ perl_back_modrdn(
 
        PerlBackend *perl_back = (PerlBackend *) be->be_private;
 
-       pthread_mutex_lock( &perl_interpreter_mutex );  
+       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 )));
+               }
                PUTBACK ;
 
                count = perl_call_method("modrdn", G_SCALAR);
@@ -61,13 +80,15 @@ perl_back_modrdn(
                PUTBACK; FREETMPS; LEAVE ;
        }
 
-       pthread_mutex_unlock( &perl_interpreter_mutex );
-
+       ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );
+       
        if( return_code != 0 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
+               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       NULL, NULL, NULL, NULL );
 
        } else {
-               send_ldap_result( conn, op, LDAP_SUCCESS, "", "" );
+               send_ldap_result( conn, op, LDAP_SUCCESS,
+                       NULL, NULL, NULL, NULL );
        }
 
        Debug( LDAP_DEBUG_ANY, "Perl MODRDN\n", 0, 0, 0 );