happy belated New Year

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

diff --git a/servers/slapd/back-perl/modify.c b/servers/slapd/back-perl/modify.c
index fa6a89f21bdc2def6425a893c800a855604e83bd..c2062ad0480aa81ff06c3c22c0e82b79607996e0 100644 (file)
--- a/servers/slapd/back-perl/modify.c
+++ b/servers/slapd/back-perl/modify.c
@@ -1,32 +1,20 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1999-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/*
- *      Copyright 1999, John C. Quillan, All rights reserved.
- *      Portions Copyright 2002, myinternet Limited. All rights reserved.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1999-2010 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.
  *
- *      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.
+ * 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 <EXTERN.h>
-#include <perl.h>
-#undef _ /* #defined by both Perl and ac/localize.h */
-
-#ifdef HAVE_WIN32_ASPERL
-#include "asperl_undefs.h"
-#endif
-
-#include "portable.h"
-
-#include <stdio.h>
-
-#include "slap.h"
-
 #include "perl_back.h"
 
 int
@@ -39,6 +27,9 @@ perl_back_modify(
        int count;
        int i;
 
+#if defined(HAVE_WIN32_ASPERL) || defined(USE_ITHREADS)
+       PERL_SET_CONTEXT( PERL_INTERPRETER );
+#endif
 
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
@@ -70,10 +61,15 @@ perl_back_modify(
                        XPUSHs(sv_2mortal(newSVpv( mods->sm_desc->ad_cname.bv_val, 0 )));
 
                        for ( i = 0;
-                               mods->sm_bvalues != NULL && mods->sm_bvalues[i].bv_val != NULL;
+                               mods->sm_values != NULL && mods->sm_values[i].bv_val != NULL;
                                i++ )
                        {
-                               XPUSHs(sv_2mortal(newSVpv( mods->sm_bvalues[i].bv_val, 0 )));
+                               XPUSHs(sv_2mortal(newSVpv( mods->sm_values[i].bv_val, 0 )));
+                       }
+
+                       /* Fix delete attrib without value. */
+                       if ( i == 0) {
+                               XPUSHs(sv_newmortal());
                        }
                }