Do not return pointers into BerElement we do not own

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

diff --git a/servers/slapd/back-shell/result.c b/servers/slapd/back-shell/result.c
index 5516118adf007e15ccd41a7dfbd696dfe2f4f7da..27cddfd6225f1e3928bfc1dab95aa4c995639467 100644 (file)
--- a/servers/slapd/back-shell/result.c
+++ b/servers/slapd/back-shell/result.c
@@ -1,7 +1,7 @@
 /* result.c - shell backend result reading function */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -19,20 +19,13 @@
 
 int
 read_and_send_results(
-    Backend    *be,
-    Connection *conn,
     Operation  *op,
-    FILE       *fp,
-    char       **attrs,
-    int                attrsonly
-)
+    SlapReply  *rs,
+    FILE       *fp )
 {
        int     bsize, len;
        char    *buf, *bp;
        char    line[BUFSIZ];
-       Entry   *e;
-       int     err;
-       char    *matched, *info;
 
        /* read in the result and send it along */
        buf = (char *) ch_malloc( BUFSIZ );
@@ -78,28 +71,28 @@ read_and_send_results(
                                break;
                        }
 
-                       if ( (e = str2entry( buf )) == NULL ) {
+                       if ( (rs->sr_entry = str2entry( buf )) == NULL ) {
                                Debug( LDAP_DEBUG_ANY, "str2entry(%s) failed\n",
                                    buf, 0, 0 );
                        } else {
-                               send_search_entry( be, conn, op, e, attrs,
-                                   attrsonly, NULL );
-                               entry_free( e );
+                               rs->sr_attrs = op->oq_search.rs_attrs;
+                               send_search_entry( op, rs );
+                               entry_free( rs->sr_entry );
                        }
 
                        bp = buf;
                }
        }
-       (void) str2result( buf, &err, &matched, &info );
+       (void) str2result( buf, &rs->sr_err, (char **)&rs->sr_matched, (char **)&rs->sr_text );
 
        /* otherwise, front end will send this result */
-       if ( err != 0 || op->o_tag != LDAP_REQ_BIND ) {
-               send_ldap_result( conn, op, err, matched, info, NULL, NULL );
+       if ( rs->sr_err != 0 || op->o_tag != LDAP_REQ_BIND ) {
+               send_ldap_result( op, rs );
        }
 
        free( buf );
 
-       return( err );
+       return( rs->sr_err );
 }
 
 void
@@ -110,7 +103,7 @@ print_suffixes(
 {
        int     i;
 
-       for ( i = 0; be->be_suffix[i] != NULL; i++ ) {
+       for ( i = 0; be->be_suffix[i].bv_val != NULL; i++ ) {
                fprintf( fp, "suffix: %s\n", be->be_suffix[i].bv_val );
        }
 }