cleanup hasSubordinate operational attr merge

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

diff --git a/servers/slapd/back-perl/compare.c b/servers/slapd/back-perl/compare.c
index 17429d10bca7461bb74c5309fe3b6e254659738d..41e2299103709266ddc44eca00a565a057f901fd 100644 (file)
--- a/servers/slapd/back-perl/compare.c
+++ b/servers/slapd/back-perl/compare.c
@@ -1,5 +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
@@ -10,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"
 
 /**********************************************************
@@ -26,23 +29,29 @@
  *
  **********************************************************/
 
+int
 perl_back_compare(
        Backend *be,
        Connection      *conn,
        Operation       *op,
-       char    *dn,
-       Ava             *ava
+       struct berval   *dn,
+       struct berval   *ndn,
+       AttributeAssertion              *ava
 )
 {
        int return_code;
        int count;
+       char *avastr, *ptr;
 
        PerlBackend *perl_back = (PerlBackend *)be->be_private;
 
-       send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM,
-               "", "not yet implemented" );
+       avastr = ch_malloc( ava->aa_desc->ad_cname.bv_len + 1 +
+               ava->aa_value.bv_len + 1 );
+       
+       lutil_strcopy( lutil_strcopy( lutil_strcopy( avastr,
+               ava->aa_desc->ad_cname.bv_val ), "=" ),
+               ava->aa_value.bv_val );
 
-#ifdef notdef
        ldap_pvt_thread_mutex_lock( &perl_interpreter_mutex );  
 
        {
@@ -50,16 +59,20 @@ perl_back_compare(
 
                PUSHMARK(sp);
                XPUSHs( perl_back->pb_obj_ref );
-               XPUSHs(sv_2mortal(newSVpv( dn , 0)));
-               /* XPUSHs(sv_2mortal(newSVpv( cred->bv_val , cred->bv_len))); */
+               XPUSHs(sv_2mortal(newSVpv( dn->bv_val , 0)));
+               XPUSHs(sv_2mortal(newSVpv( avastr , 0)));
                PUTBACK;
 
-               count = perl_call_method("bind", G_SCALAR);
+#ifdef PERL_IS_5_6
+               count = call_method("compare", G_SCALAR);
+#else
+               count = perl_call_method("compare", G_SCALAR);
+#endif
 
                SPAGAIN;
 
                if (count != 1) {
-                       croak("Big trouble in back_search\n");
+                       croak("Big trouble in back_compare\n");
                }
 
                return_code = POPi;
@@ -69,15 +82,12 @@ perl_back_compare(
 
        ldap_pvt_thread_mutex_unlock( &perl_interpreter_mutex );        
 
-       if( return_code != 0 ) {
-               send_ldap_result( conn, op, LDAP_COMPARE_TRUE, "", "" );
+       ch_free( avastr );
 
-       } else {
-               send_ldap_result( conn, op, LDAP_COMPARE_FALSE, "", "" );
-       }
-#endif
+       send_ldap_result( conn, op, return_code,
+               NULL, NULL, NULL, NULL );
 
-       Debug( LDAP_DEBUG_ANY, "Here BIND\n", 0, 0, 0 );
+       Debug( LDAP_DEBUG_ANY, "Perl COMPARE\n", 0, 0, 0 );
 
        return (0);
 }