Major API change - (SLAP_OP_BLOCKS) All request parameters are

[openldap] / servers / slapd / back-shell / bind.c

diff --git a/servers/slapd/back-shell/bind.c b/servers/slapd/back-shell/bind.c
index cb21ff338bb90420e97206f468674fd875d80bb5..0acca761ce517394b3ad9b655d8a3c311c03129f 100644 (file)
--- a/servers/slapd/back-shell/bind.c
+++ b/servers/slapd/back-shell/bind.c
@@ -17,64 +17,56 @@
 
 int
 shell_back_bind(
-    Backend            *be,
-    Connection         *conn,
     Operation          *op,
-    struct berval      *dn,
-    struct berval      *ndn,
-    int                        method,
-    struct berval      *cred,
-    struct berval      *edn
-)
+    SlapReply          *rs )
 {
-       struct shellinfo        *si = (struct shellinfo *) be->be_private;
+       struct shellinfo        *si = (struct shellinfo *) op->o_bd->be_private;
        AttributeDescription *entry = slap_schema.si_ad_entry;
        Entry e;
        FILE                    *rfp, *wfp;
        int                     rc;
 
        if ( si->si_bind == NULL ) {
-               send_ldap_result( conn, op, LDAP_UNWILLING_TO_PERFORM, NULL,
-                   "bind not implemented", NULL, NULL );
+               send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+                   "bind not implemented" );
                return( -1 );
        }
 
        e.e_id = NOID;
-       e.e_name = *dn;
-       e.e_nname = *ndn;
+       e.e_name = op->o_req_dn;
+       e.e_nname = op->o_req_ndn;
        e.e_attrs = NULL;
        e.e_ocflags = 0;
        e.e_bv.bv_len = 0;
        e.e_bv.bv_val = NULL;
        e.e_private = NULL;
 
-       if ( ! access_allowed( be, conn, op, &e,
+       if ( ! access_allowed( op, &e,
                entry, NULL, ACL_AUTH, NULL ) )
        {
-               send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
-                       NULL, NULL, NULL, NULL );
+               send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS, NULL );
                return -1;
        }
 
        if ( (op->o_private = (void *) forkandexec( si->si_bind, &rfp, &wfp ))
            == (void *) -1 ) {
-               send_ldap_result( conn, op, LDAP_OTHER, NULL,
-                   "could not fork/exec", NULL, NULL );
+               send_ldap_error( op, rs, LDAP_OTHER,
+                   "could not fork/exec" );
                return( -1 );
        }
 
        /* write out the request to the bind process */
        fprintf( wfp, "BIND\n" );
        fprintf( wfp, "msgid: %ld\n", (long) op->o_msgid );
-       print_suffixes( wfp, be );
-       fprintf( wfp, "dn: %s\n", dn->bv_val );
-       fprintf( wfp, "method: %d\n", method );
-       fprintf( wfp, "credlen: %lu\n", cred->bv_len );
-       fprintf( wfp, "cred: %s\n", cred->bv_val ); /* XXX */
+       print_suffixes( wfp, op->o_bd );
+       fprintf( wfp, "dn: %s\n", op->o_req_dn.bv_val );
+       fprintf( wfp, "method: %d\n", op->oq_bind.rb_method );
+       fprintf( wfp, "credlen: %lu\n", op->oq_bind.rb_cred.bv_len );
+       fprintf( wfp, "cred: %s\n", op->oq_bind.rb_cred.bv_val ); /* XXX */
        fclose( wfp );
 
        /* read in the results and send them along */
-       rc = read_and_send_results( be, conn, op, rfp, NULL, 0 );
+       rc = read_and_send_results( op, rs, rfp );
        fclose( rfp );
 
        return( rc );