Remove lint

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

diff --git a/servers/slapd/back-perl/modify.c b/servers/slapd/back-perl/modify.c
index 5122eb780c80a5c6568a46a62840e61633c6f70b..5d13518fe67ebddb0fdb59c921237b234da372f2 100644 (file)
--- a/servers/slapd/back-perl/modify.c
+++ b/servers/slapd/back-perl/modify.c
@@ -1,6 +1,7 @@
 /* $OpenLDAP$ */
 /*
  *      Copyright 1999, John C. Quillan, All rights reserved.
+ *      Portions Copyright 2002, myinternet Limited. All rights reserved.
  *
  *      Redistribution and use in source and binary forms are permitted only
  *      as authorized by the OpenLDAP Public License.  A copy of this
@@ -11,14 +12,15 @@
 #include "portable.h"
 
 #include <stdio.h>
-/* #include <ac/types.h>
-       #include <ac/socket.h>
-*/
+
+#include "slap.h"
+#ifdef HAVE_WIN32_ASPERL
+#include "asperl_undefs.h"
+#endif
 
 #include <EXTERN.h>
 #include <perl.h>
 
-#include "slap.h"
 #include "perl_back.h"
 
 int
@@ -67,7 +69,7 @@ perl_back_modify(
                        }
 
                        
-                       XPUSHs(sv_2mortal(newSVpv( mods->sm_type.bv_val, 0 )));
+                       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;
@@ -79,7 +81,11 @@ perl_back_modify(
 
                PUTBACK;
 
+#ifdef PERL_IS_5_6
+               count = call_method("modify", G_SCALAR);
+#else
                count = perl_call_method("modify", G_SCALAR);
+#endif
 
                SPAGAIN;
 
@@ -94,14 +100,8 @@ perl_back_modify(
 
        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( conn, op, return_code,
+               NULL, NULL, NULL, NULL );
 
        Debug( LDAP_DEBUG_ANY, "Perl MODIFY\n", 0, 0, 0 );
        return( 0 );