Happy new year

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

diff --git a/servers/slapd/back-perl/compare.c b/servers/slapd/back-perl/compare.c
index 1ca29f9f0a46b1c9e79fbd37b281122b02ef1b26..26218a1c394833915876eca851d598d2a02d7bb7 100644 (file)
--- a/servers/slapd/back-perl/compare.c
+++ b/servers/slapd/back-perl/compare.c
@@ -1,25 +1,35 @@
 /* $OpenLDAP$ */
-/*
- *      Copyright 1999, John C. Quillan, All rights reserved.
- *      Portions Copyright 2002, myinternet pty ltd. All rights reserved.
+/* 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-2004 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 <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 <ac/types.h>
-       #include <ac/socket.h>
-*/
-
-#include <EXTERN.h>
-#include <perl.h>
 
 #include "slap.h"
+
+#include "lutil.h"
 #include "perl_back.h"
 
 /**********************************************************
@@ -28,27 +38,22 @@
  *
  **********************************************************/
 
+int
 perl_back_compare(
-       Backend *be,
-       Connection      *conn,
        Operation       *op,
-       struct berval   *dn,
-       struct berval   *ndn,
-       AttributeAssertion              *ava
-)
+       SlapReply       *rs )
 {
-       int return_code;
        int count;
        char *avastr, *ptr;
 
-       PerlBackend *perl_back = (PerlBackend *)be->be_private;
+       PerlBackend *perl_back = (PerlBackend *)op->o_bd->be_private;
 
-       avastr = ch_malloc( ava->aa_desc->ad_cname.bv_len + 1 +
-               ava->aa_value.bv_len + 1 );
+       avastr = ch_malloc( op->orc_ava->aa_desc->ad_cname.bv_len + 1 +
+               op->orc_ava->aa_value.bv_len + 1 );
        
-       slap_strcopy( slap_strcopy( slap_strcopy( avastr,
-               ava->aa_desc->ad_cname.bv_val ), "=" ),
-               ava->aa_value.bv_val );
+       lutil_strcopy( lutil_strcopy( lutil_strcopy( avastr,
+               op->orc_ava->aa_desc->ad_cname.bv_val ), "=" ),
+               op->orc_ava->aa_value.bv_val );
 
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
@@ -57,7 +62,7 @@ perl_back_compare(
 
                PUSHMARK(sp);
                XPUSHs( perl_back->pb_obj_ref );
-               XPUSHs(sv_2mortal(newSVpv( dn->bv_val , 0)));
+               XPUSHs(sv_2mortal(newSVpv( op->o_req_dn.bv_val , 0)));
                XPUSHs(sv_2mortal(newSVpv( avastr , 0)));
                PUTBACK;
 
@@ -73,8 +78,8 @@ perl_back_compare(
                        croak("Big trouble in back_compare\n");
                }
 
-               return_code = POPi;
-                                                        
+               rs->sr_err = POPi;
+
                PUTBACK; FREETMPS; LEAVE;
        }
 
@@ -82,8 +87,7 @@ perl_back_compare(
 
        ch_free( avastr );
 
-       send_ldap_result( conn, op, return_code,
-               NULL, NULL, NULL, NULL );
+       send_ldap_result( op, rs );
 
        Debug( LDAP_DEBUG_ANY, "Perl COMPARE\n", 0, 0, 0 );