Merge remote-tracking branch 'origin/mdb.master'

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

diff --git a/servers/slapd/back-perl/modify.c b/servers/slapd/back-perl/modify.c
index c0f8227a0108877ea42d6925a7d97b13f0c29ba5..e8335cd01e9389447f6321ff3e1f67704ec87d13 100644 (file)
--- a/servers/slapd/back-perl/modify.c
+++ b/servers/slapd/back-perl/modify.c
@@ -1,102 +1,95 @@
-/*
- *      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-2012 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"
+#include <ac/string.h>
 
 int
 perl_back_modify(
-       Backend *be,
-       Connection      *conn,
        Operation       *op,
-       char    *dn,
-       LDAPModList     *modlist
-)
+       SlapReply       *rs )
 {
-       char test[500];
-       int return_code;
+       PerlBackend *perl_back = (PerlBackend *)op->o_bd->be_private;
+       Modifications *modlist = op->orm_modlist;
        int count;
        int i;
-       int err = 0;
-       char *matched = NULL, *info = NULL;
-
-       PerlBackend *perl_back = (PerlBackend *)be->be_private;
 
+       PERL_SET_CONTEXT( PERL_INTERPRETER );
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {
                dSP; ENTER; SAVETMPS;
-
+               
                PUSHMARK(sp);
                XPUSHs( perl_back->pb_obj_ref );
+               XPUSHs(sv_2mortal(newSVpv( op->o_req_dn.bv_val , 0)));
 
-               for (; modlist != NULL; modlist = modlist->ml_next ) {
-                       LDAPMod *mods = &modlist->ml_mod;
+               for (; modlist != NULL; modlist = modlist->sml_next ) {
+                       Modification *mods = &modlist->sml_mod;
 
-                       switch ( mods->mod_op & ~LDAP_MOD_BVALUES ) {
+                       switch ( mods->sm_op & ~LDAP_MOD_BVALUES ) {
                        case LDAP_MOD_ADD:
-                               XPUSHs(sv_2mortal(newSVpv("ADD", 0 )));
+                               XPUSHs(sv_2mortal(newSVpv("ADD", STRLENOF("ADD") )));
                                break;
                                
                        case LDAP_MOD_DELETE:
-                               XPUSHs(sv_2mortal(newSVpv("DELETE", 0 )));
+                               XPUSHs(sv_2mortal(newSVpv("DELETE", STRLENOF("DELETE") )));
                                break;
                                
                        case LDAP_MOD_REPLACE:
-                               XPUSHs(sv_2mortal(newSVpv("REPLACE", 0 )));
+                               XPUSHs(sv_2mortal(newSVpv("REPLACE", STRLENOF("REPLACE") )));
                                break;
                        }
 
-
-                       XPUSHs(sv_2mortal(newSVpv( mods->mod_type, 0 )));
+                       
+                       XPUSHs(sv_2mortal(newSVpv( mods->sm_desc->ad_cname.bv_val,
+                               mods->sm_desc->ad_cname.bv_len )));
 
                        for ( i = 0;
-                               mods->mod_bvalues != NULL && mods->mod_bvalues[i] != NULL;
+                               mods->sm_values != NULL && mods->sm_values[i].bv_val != NULL;
                                i++ )
                        {
-                               XPUSHs(sv_2mortal(newSVpv( mods->mod_bvalues[i]->bv_val, 0 )));
+                               XPUSHs(sv_2mortal(newSVpv( mods->sm_values[i].bv_val, mods->sm_values[i].bv_len )));
+                       }
+
+                       /* Fix delete attrib without value. */
+                       if ( i == 0) {
+                               XPUSHs(sv_newmortal());
                        }
                }
 
                PUTBACK;
 
-               count = perl_call_method("modify", G_SCALAR);
+               count = call_method("modify", G_SCALAR);
 
                SPAGAIN;
 
                if (count != 1) {
-                       croak("Big trouble in back_search\n");
+                       croak("Big trouble in back_modify\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 MODIFY\n", 0, 0, 0 );
        return( 0 );