X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-perl%2Fmodify.c;h=e8335cd01e9389447f6321ff3e1f67704ec87d13;hb=f51efd4b0345baea1a9c977d0763292891c37436;hp=0841ddb6e02c306211d73eb206b3a79270947ac3;hpb=3c598e89fb34a892d369a138daa8c3314294493c;p=openldap
diff --git a/servers/slapd/back-perl/modify.c b/servers/slapd/back-perl/modify.c
index 0841ddb6e0..e8335cd01e 100644
--- a/servers/slapd/back-perl/modify.c
+++ b/servers/slapd/back-perl/modify.c
@@ -1,7 +1,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2012 The OpenLDAP Foundation.
* Portions Copyright 1999 John C. Quillan.
* Portions Copyright 2002 myinternet Limited.
* All rights reserved.
@@ -15,21 +15,8 @@
* .
*/
-#include
-#include
-#undef _ /* #defined by both Perl and ac/localize.h */
-
-#ifdef HAVE_WIN32_ASPERL
-#include "asperl_undefs.h"
-#endif
-
-#include "portable.h"
-
-#include
-
-#include "slap.h"
-
#include "perl_back.h"
+#include
int
perl_back_modify(
@@ -41,7 +28,7 @@ perl_back_modify(
int count;
int i;
-
+ PERL_SET_CONTEXT( PERL_INTERPRETER );
ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );
{
@@ -56,36 +43,38 @@ perl_back_modify(
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->sm_desc->ad_cname.bv_val, 0 )));
+ XPUSHs(sv_2mortal(newSVpv( mods->sm_desc->ad_cname.bv_val,
+ mods->sm_desc->ad_cname.bv_len )));
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, mods->sm_values[i].bv_len )));
+ }
+
+ /* Fix delete attrib without value. */
+ if ( i == 0) {
+ XPUSHs(sv_newmortal());
}
}
PUTBACK;
-#ifdef PERL_IS_5_6
count = call_method("modify", G_SCALAR);
-#else
- count = perl_call_method("modify", G_SCALAR);
-#endif
SPAGAIN;