Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

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

diff --git a/servers/slapd/back-perl/add.c b/servers/slapd/back-perl/add.c
index 89193b499a4c9ee833fddb2dc91e7098e76f3120..000973eb887c04af20e7ed67bb8ba03fb3564440 100644 (file)
--- a/servers/slapd/back-perl/add.c
+++ b/servers/slapd/back-perl/add.c
@@ -1,74 +1,62 @@
-/*
- *      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.
+ * Copyright 1999-2013 The OpenLDAP Foundation.
+ * Portions Copyright 1999 John C. Quillan.
+ * Portions Copyright 2002 myinternet Limited.
+ * 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 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_add(
-       Backend *be,
-       Connection      *conn,
        Operation       *op,
-       Entry   *e
-)
+       SlapReply       *rs )
 {
+       PerlBackend *perl_back = (PerlBackend *) op->o_bd->be_private;
        int len;
        int count;
-       int return_code;
-
-       PerlBackend *perl_back = (PerlBackend *) be->be_private;
 
-       ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
+       PERL_SET_CONTEXT( PERL_INTERPRETER );
+       ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );
+       ldap_pvt_thread_mutex_lock( &entry2str_mutex );
 
        {
                dSP; ENTER; SAVETMPS;
 
                PUSHMARK(sp);
                XPUSHs( perl_back->pb_obj_ref );
-               XPUSHs(sv_2mortal(newSVpv( entry2str( e, &len, 0 ), 0 )));
+               XPUSHs(sv_2mortal(newSVpv( entry2str( op->ora_e, &len ), 0 )));
 
                PUTBACK;
 
-               count = perl_call_method("add", G_SCALAR);
+               count = call_method("add", G_SCALAR);
 
                SPAGAIN;
 
                if (count != 1) {
-                       croak("Big trouble in back_search\n");
+                       croak("Big trouble in back_add\n");
                }
                                                         
-               return_code = POPi;
+               rs->sr_err = POPi;
 
                PUTBACK; FREETMPS; LEAVE;
        }
 
+       ldap_pvt_thread_mutex_unlock( &entry2str_mutex );
        ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );        
 
-       if( return_code != 0 ) {
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-                       NULL, NULL, NULL, NULL );
-
-       } else {
-               send_ldap_result( conn, op, LDAP_SUCCESS,
-                       NULL, NULL, NULL, NULL );
-       }
+       send_ldap_result( op, rs );
 
-       Debug( LDAP_DEBUG_ANY, "Here ADD\n", 0, 0, 0 );
+       Debug( LDAP_DEBUG_ANY, "Perl ADD\n", 0, 0, 0 );
        return( 0 );
 }