]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/result.c
Merge in all -devel changes made since branch was created.
[openldap] / servers / slapd / result.c
index 0ef82a7b3e36e03f85a4a71a91040153fe182064..6f3434276d82b02533cf00e3e3ab72354451f26b 100644 (file)
@@ -1,50 +1,62 @@
 /* result.c - routines to send ldap results, errors, and referrals */
 
-#include <stdio.h>
-#include <string.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <errno.h>
-#include <signal.h>
 #include "portable.h"
+
+#include <stdio.h>
+
+#include <ac/socket.h>
+#include <ac/errno.h>
+#include <ac/signal.h>
+#include <ac/string.h>
+#include <ac/ctype.h>
+#include <ac/time.h>
+#include <ac/unistd.h>
+
+#include "ldap_defaults.h"
 #include "slap.h"
 
-#ifndef SYSERRLIST_IN_STDIO
-extern int             sys_nerr;
-extern char            *sys_errlist[];
-#endif
-extern int             active_threads;
-extern pthread_mutex_t active_threads_mutex;
-extern pthread_mutex_t new_conn_mutex;
-extern pthread_t       listener_tid;
-extern struct acl      *acl_get_applicable();
-extern long            num_entries_sent;
-extern long            num_bytes_sent;
-extern pthread_mutex_t num_sent_mutex;
+/* we need LBER internals */
+#include "../../libraries/liblber/lber-int.h"
 
-void   close_connection();
+static char *v2ref( struct berval **ref )
+{
+       size_t len, i;
+       char *v2;
 
-static void
-send_ldap_result2(
-    Connection *conn,
-    Operation  *op,
-    int                err,
-    char       *matched,
-    char       *text,
-    int                nentries
-)
+       if(ref == NULL) return NULL;
+
+       len = sizeof("Referral:");
+       v2 = ch_strdup("Referral:");
+
+       for( i=0; ref[i] != NULL; i++ ) {
+               v2 = ch_realloc( v2, len + ref[i]->bv_len + 1 );
+               v2[len-1] = '\n';
+               memcpy(&v2[len], ref[i]->bv_val, ref[i]->bv_len );
+               len += ref[i]->bv_len;
+       }
+
+       v2[len-1] = '\0';
+       return v2;
+}
+
+static ber_tag_t req2res( ber_tag_t tag )
 {
-       BerElement      *ber;
-       int             rc, sd;
-       unsigned long   tag, bytes;
+       switch( tag ) {
+       case LDAP_REQ_ADD:
+       case LDAP_REQ_BIND:
+       case LDAP_REQ_COMPARE:
+       case LDAP_REQ_EXTENDED:
+       case LDAP_REQ_MODIFY:
+       case LDAP_REQ_MODRDN:
+               tag++;
+               break;
 
-       Debug( LDAP_DEBUG_TRACE, "send_ldap_result %d:%s:%s\n", err, matched ?
-           matched : "", text ? text : "" );
+       case LDAP_REQ_DELETE:
+               tag = LDAP_RES_DELETE;
+               break;
 
-       switch ( op->o_tag ) {
-       case LBER_DEFAULT:
+       case LDAP_REQ_ABANDON:
+       case LDAP_REQ_UNBIND:
                tag = LBER_SEQUENCE;
                break;
 
@@ -52,132 +64,426 @@ send_ldap_result2(
                tag = LDAP_RES_SEARCH_RESULT;
                break;
 
-       case LDAP_REQ_DELETE:
-               tag = LDAP_RES_DELETE;
-               break;
-
        default:
-               tag = op->o_tag + 1;
-               break;
+               assert( 0 );
+               tag = LBER_ERROR;
        }
+       return tag;
+}
 
-#ifdef COMPAT30
-       if ( (ber = ber_alloc_t( conn->c_version == 30 ? 0 : LBER_USE_DER ))
-           == NULLBER ) {
-#else
-       if ( (ber = der_alloc()) == NULLBER ) {
-#endif
-               Debug( LDAP_DEBUG_ANY, "ber_alloc failed\n", 0, 0, 0 );
-               return;
+static void trim_refs_urls(
+       struct berval **refs )
+{
+       unsigned i;
+
+       if( refs == NULL ) return;
+
+       for( i=0; refs[i] != NULL; i++ ) {
+               if(     refs[i]->bv_len > sizeof("ldap://") &&
+                       strncasecmp( refs[i]->bv_val, "ldap://",
+                               sizeof("ldap://")-1 ) == 0 )
+               {
+                       unsigned j;
+                       for( j=sizeof("ldap://"); j<refs[i]->bv_len ; j++ ) {
+                               if( refs[i]->bv_val[j] = '/' ) {
+                                       refs[i]->bv_val[j] = '\0';
+                                       refs[i]->bv_len = j;
+                                       break;
+                               }
+                       }
+               }
+       }
+}
+
+struct berval **get_entry_referrals(
+       Backend *be,
+       Connection *conn,
+       Operation *op,
+       Entry *e )
+{
+       Attribute *attr;
+       struct berval **refs;
+       unsigned i, j;
+
+       attr = attr_find( e->e_attrs, "ref" );
+
+       if( attr == NULL ) return NULL;
+
+       for( i=0; attr->a_vals[i] != NULL; i++ ) {
+               /* count references */
        }
 
-#ifdef CLDAP
-       if ( op->o_cldap ) {
-               rc = ber_printf( ber, "{is{t{ess}}}", op->o_msgid, "", tag,
-                   err, matched ? matched : "", text ? text : "" );
-       } else
-#endif
-#ifdef COMPAT30
-       if ( conn->c_version == 30 ) {
-               rc = ber_printf( ber, "{it{{ess}}}", op->o_msgid, tag, err,
-                   matched ? matched : "", text ? text : "" );
-       } else
-#endif
-               rc = ber_printf( ber, "{it{ess}}", op->o_msgid, tag, err,
-                   matched ? matched : "", text ? text : "" );
+       if( i < 1 ) return NULL;
 
-       if ( rc == -1 ) {
-               Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
-               return;
+       refs = ch_malloc( i + 1 );
+
+       for( i=0, j=0; attr->a_vals[i] != NULL; i++ ) {
+               unsigned k;
+               struct berval *ref = ber_bvdup( attr->a_vals[i] );
+
+               /* trim the label */
+               for( k=0; k<ref->bv_len; k++ ) {
+                       if( isspace(ref->bv_val[k]) ) {
+                               ref->bv_val[k] = '\0';
+                               ref->bv_len = k;
+                               break;
+                       }
+               }
+
+               if(     ref->bv_len > 0 ) {
+                       refs[j++] = ref;
+
+               } else {
+                       ber_bvfree( ref );
+               }
+       }
+
+       refs[j] = NULL;
+
+       if( j == 0 ) {
+               ber_bvecfree( refs );
+               refs = NULL;
        }
 
+       /* we should check that a referral value exists... */
+
+       return refs;
+}
+
+static long send_ldap_ber(
+       Connection *conn,
+       BerElement *ber )
+{
+       ber_len_t bytes = ber_pvt_ber_bytes( ber );
+
        /* write only one pdu at a time - wait til it's our turn */
-       pthread_mutex_lock( &conn->c_pdumutex );
+       ldap_pvt_thread_mutex_lock( &conn->c_write_mutex );
+
+       /* lock the connection */ 
+       ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 
        /* write the pdu */
-       bytes = ber->ber_ptr - ber->ber_buf;
-       pthread_mutex_lock( &new_conn_mutex );
-       while ( conn->c_connid == op->o_connid && ber_flush( &conn->c_sb, ber,
-           1 ) != 0 ) {
-               pthread_mutex_unlock( &new_conn_mutex );
+       while( 1 ) {
+               int err;
+
+               if ( connection_state_closing( conn ) ) {
+                       ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+                       ldap_pvt_thread_mutex_unlock( &conn->c_write_mutex );
+                       return 0;
+               }
+
+               if ( ber_flush( conn->c_sb, ber, 1 ) == 0 ) {
+                       break;
+               }
+
+               err = errno;
+
                /*
                 * we got an error.  if it's ewouldblock, we need to
                 * wait on the socket being writable.  otherwise, figure
                 * it's a hard error and return.
                 */
 
-               Debug( LDAP_DEBUG_CONNS, "ber_flush failed errno %d msg (%s)\n",
-                   errno, errno > -1 && errno < sys_nerr ? sys_errlist[errno]
+               Debug( LDAP_DEBUG_CONNS, "ber_flush failed errno=%d reason=\"%s\"\n",
+                   err, err > -1 && err < sys_nerr ? sys_errlist[err]
                    : "unknown", 0 );
 
-               if ( errno != EWOULDBLOCK && errno != EAGAIN ) {
-                       close_connection( conn, op->o_connid, op->o_opid );
+               if ( err != EWOULDBLOCK && err != EAGAIN ) {
+                       connection_closing( conn );
 
-                       pthread_mutex_unlock( &conn->c_pdumutex );
-                       return;
+                       ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+                       ldap_pvt_thread_mutex_unlock( &conn->c_write_mutex );
+                       return( -1 );
                }
 
                /* wait for socket to be write-ready */
-               pthread_mutex_lock( &active_threads_mutex );
-               active_threads--;
                conn->c_writewaiter = 1;
-               pthread_kill( listener_tid, SIGUSR1 );
-               pthread_cond_wait( &conn->c_wcv, &active_threads_mutex );
-               pthread_mutex_unlock( &active_threads_mutex );
+               slapd_set_write( ber_pvt_sb_get_desc( conn->c_sb ), 1 );
 
-               pthread_yield();
-               pthread_mutex_lock( &new_conn_mutex );
+               ldap_pvt_thread_cond_wait( &conn->c_write_cv, &conn->c_mutex );
+               conn->c_writewaiter = 0;
        }
-       pthread_mutex_unlock( &new_conn_mutex );
-       pthread_mutex_unlock( &conn->c_pdumutex );
 
-       pthread_mutex_lock( &num_sent_mutex );
-       num_bytes_sent += bytes;
-       pthread_mutex_unlock( &num_sent_mutex );
+       ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+       ldap_pvt_thread_mutex_unlock( &conn->c_write_mutex );
 
-       Statslog( LDAP_DEBUG_STATS,
-           "conn=%d op=%d RESULT err=%d tag=%d nentries=%d\n", conn->c_connid,
-           op->o_opid, err, tag, nentries );
+       return bytes;
+}
+
+static void
+send_ldap_response(
+    Connection *conn,
+    Operation  *op,
+       ber_tag_t       tag,
+       ber_int_t       msgid,
+    ber_int_t  err,
+    char       *matched,
+    char       *text,
+       struct berval   **ref,
+       char    *resoid,
+       struct berval   *resdata,
+       LDAPControl **ctrls
+)
+{
+       BerElement      *ber;
+       int             rc;
+       long    bytes;
+
+       assert( ctrls == NULL ); /* ctrls not implemented */
+
+       ber = ber_alloc_t( LBER_USE_DER );
+
+       Debug( LDAP_DEBUG_TRACE, "send_ldap_response: msgid=%ld tag=%ld err=%ld\n",
+               (long) msgid, (long) tag, (long) err );
+
+       if ( ber == NULL ) {
+               Debug( LDAP_DEBUG_ANY, "ber_alloc failed\n", 0, 0, 0 );
+               return;
+       }
+
+#ifdef LDAP_CONNECTIONLESS
+       if ( op->o_cldap ) {
+               rc = ber_printf( ber, "{is{t{ess}}}", msgid, "", tag,
+                   err, matched ? matched : "", text ? text : "" );
+       } else
+#endif
+       {
+               rc = ber_printf( ber, "{it{ess",
+                       msgid, tag, err,
+                       matched == NULL ? "" : matched,
+                       text == NULL ? "" : text );
+
+               if( rc != -1 && ref != NULL ) {
+                       rc = ber_printf( ber, "{V}", ref );
+               }
+
+               if( rc != -1 && resoid != NULL ) {
+                       rc = ber_printf( ber, "s", resoid );
+               }
+
+               if( rc != -1 && resdata != NULL ) {
+                       rc = ber_printf( ber, "O", resdata );
+
+               }
+
+               if( rc != -1 ) {
+                       rc = ber_printf( ber, "}}" );
+               }
+       }
+
+       if ( rc == -1 ) {
+               Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
+               return;
+       }
 
+       /* send BER */
+       bytes = send_ldap_ber( conn, ber );
+
+       if ( bytes < 0 ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "send_ldap_response: ber write failed\n",
+                       0, 0, 0 );
+               return;
+       }
+
+       ldap_pvt_thread_mutex_lock( &num_sent_mutex );
+       num_bytes_sent += bytes;
+       num_pdu_sent++;
+       ldap_pvt_thread_mutex_unlock( &num_sent_mutex );
        return;
 }
 
+
 void
-send_ldap_result(
+send_ldap_disconnect(
     Connection *conn,
     Operation  *op,
-    int                err,
-    char       *matched,
+    ber_int_t  err,
     char       *text
 )
 {
-#ifdef CLDAP
+       ber_tag_t tag;
+       ber_int_t msgid;
+       char *reqoid;
+
+#define LDAP_UNSOLICITED_ERROR(e) \
+       (  (e) == LDAP_PROTOCOL_ERROR \
+       || (e) == LDAP_STRONG_AUTH_REQUIRED \
+       || (e) == LDAP_UNAVAILABLE )
+
+       assert( LDAP_UNSOLICITED_ERROR( err ) );
+
+       Debug( LDAP_DEBUG_TRACE,
+               "send_ldap_disconnect %d:%s\n",
+               err, text ? text : "", NULL );
+
+       if ( op->o_protocol < LDAP_VERSION3 ) {
+               reqoid = NULL;
+               tag = req2res( op->o_tag );
+               msgid = (tag != LBER_SEQUENCE) ? op->o_msgid : 0;
+
+       } else {
+               reqoid = LDAP_NOTICE_DISCONNECT;
+               tag = LDAP_RES_EXTENDED;
+               msgid = 0;
+       }
+
+#ifdef LDAP_CONNECTIONLESS
        if ( op->o_cldap ) {
-               SAFEMEMCPY( (char *)conn->c_sb.sb_useaddr, &op->o_clientaddr,
-                   sizeof( struct sockaddr ));
+               ber_pvt_sb_udp_set_dst( conn->c_sb, &op->o_clientaddr );
                Debug( LDAP_DEBUG_TRACE, "UDP response to %s port %d\n", 
                    inet_ntoa(((struct sockaddr_in *)
-                   conn->c_sb.sb_useaddr)->sin_addr ),
-                   ((struct sockaddr_in *) conn->c_sb.sb_useaddr)->sin_port,
+                   &op->o_clientaddr)->sin_addr ),
+                   ((struct sockaddr_in *) &op->o_clientaddr)->sin_port,
                    0 );
        }
 #endif
-       send_ldap_result2( conn, op, err, matched, text, 0 );
+       send_ldap_response( conn, op, tag, msgid,
+               err, NULL, text, NULL,
+               reqoid, NULL, NULL );
+
+       Statslog( LDAP_DEBUG_STATS,
+           "conn=%ld op=%ld DISCONNECT err=%ld tag=%lu text=%s\n",
+               (long) op->o_connid, (long) op->o_opid,
+               (long) tag, (long) err, text ? text : "" );
 }
 
 void
-send_ldap_search_result(
+send_ldap_result(
     Connection *conn,
     Operation  *op,
-    int                err,
+    ber_int_t  err,
     char       *matched,
     char       *text,
+       struct berval **ref,
+       LDAPControl **ctrls
+)
+{
+       ber_tag_t tag;
+       ber_int_t msgid;
+       char *tmp = NULL;
+
+       assert( !LDAP_API_ERROR( err ) );
+
+       Debug( LDAP_DEBUG_TRACE, "send_ldap_result: conn=%ld op=%ld p=%d\n",
+               (long) op->o_connid, (long) op->o_opid, op->o_protocol );
+       Debug( LDAP_DEBUG_ARGS, "send_ldap_result: %d:%s:%s\n",
+               err, matched ?  matched : "", text ? text : "" );
+
+       assert( err != LDAP_PARTIAL_RESULTS );
+
+       if( op->o_tag != LDAP_REQ_SEARCH ) {
+               trim_refs_urls( ref );
+       }
+
+       if ( err == LDAP_REFERRAL ) {
+               if( ref == NULL ) {
+                       err = LDAP_NO_SUCH_OBJECT;
+               } else if ( op->o_protocol < LDAP_VERSION3 ) {
+                       err = LDAP_PARTIAL_RESULTS;
+                       tmp = text = v2ref( ref );
+                       ref = NULL;
+               }
+       }
+
+       tag = req2res( op->o_tag );
+       msgid = (tag != LBER_SEQUENCE) ? op->o_msgid : 0;
+
+#ifdef LDAP_CONNECTIONLESS
+       if ( op->o_cldap ) {
+               ber_pvt_sb_udp_set_dst( conn->c_sb, &op->o_clientaddr );
+               Debug( LDAP_DEBUG_TRACE, "UDP response to %s port %d\n", 
+                   inet_ntoa(((struct sockaddr_in *)
+                   &op->o_clientaddr)->sin_addr ),
+                   ((struct sockaddr_in *) &op->o_clientaddr)->sin_port,
+                   0 );
+       }
+#endif
+
+       send_ldap_response( conn, op, tag, msgid,
+               err, matched, text, ref,
+               NULL, NULL, ctrls );
+
+       Statslog( LDAP_DEBUG_STATS,
+           "conn=%ld op=%ld RESULT tag=%lu err=%ld text=%s\n",
+               (long) op->o_connid, (long) op->o_opid,
+               (long) tag, (long) err, text ? text : "" );
+
+       if( tmp != NULL ) {
+               free(tmp);
+       }
+}
+
+
+void
+send_search_result(
+    Connection *conn,
+    Operation  *op,
+    ber_int_t  err,
+    char       *matched,
+       char    *text,
+    struct berval **refs,
+       LDAPControl **ctrls,
     int                nentries
 )
 {
-       send_ldap_result2( conn, op, err, matched, text, nentries );
+       ber_tag_t tag;
+       ber_int_t msgid;
+       char *tmp = NULL;
+       assert( !LDAP_API_ERROR( err ) );
+
+       Debug( LDAP_DEBUG_TRACE, "send_ldap_search_result %d:%s:%s\n",
+               err, matched ?  matched : "", text ? text : "" );
+
+       assert( err != LDAP_PARTIAL_RESULTS );
+
+       trim_refs_urls( refs );
+
+       if( op->o_protocol < LDAP_VERSION3 ) {
+               /* send references in search results */
+               if( err == LDAP_REFERRAL ) {
+                       err = LDAP_PARTIAL_RESULTS;
+               }
+
+               tmp = text = v2ref( refs );
+               refs = NULL;
+
+       } else {
+               /* don't send references in search results */
+               assert( refs == NULL );
+               refs = NULL;
+
+               if( err == LDAP_REFERRAL ) {
+                       err = LDAP_SUCCESS;
+               }
+       }
+
+       tag = req2res( op->o_tag );
+       msgid = (tag != LBER_SEQUENCE) ? op->o_msgid : 0;
+
+#ifdef LDAP_CONNECTIONLESS
+       if ( op->o_cldap ) {
+               ber_pvt_sb_udp_set_dst( &conn->c_sb, &op->o_clientaddr );
+               Debug( LDAP_DEBUG_TRACE, "UDP response to %s port %d\n", 
+                   inet_ntoa(((struct sockaddr_in *)
+                   &op->o_clientaddr)->sin_addr ),
+                   ((struct sockaddr_in *) &op->o_clientaddr)->sin_port,
+                   0 );
+       }
+#endif
+
+       send_ldap_response( conn, op, tag, msgid,
+               err, matched, text, refs,
+               NULL, NULL, ctrls );
+
+       Statslog( LDAP_DEBUG_STATS,
+           "conn=%ld op=%ld SEARCH RESULT tag=%lu err=%ld text=%s\n",
+               (long) op->o_connid, (long) op->o_opid,
+               (long) tag, (long) err, text ? text : "" );
+
 }
 
+
 int
 send_search_entry(
     Backend    *be,
@@ -185,179 +491,330 @@ send_search_entry(
     Operation  *op,
     Entry      *e,
     char       **attrs,
-    int                attrsonly
+    int                attrsonly,
+       LDAPControl **ctrls
 )
 {
        BerElement      *ber;
        Attribute       *a;
-       int             i, rc, bytes, sd;
-       struct acl      *acl;
+       int             i, rc=-1, bytes;
+       AccessControl   *acl;
+       char            *edn;
+       int             userattrs;
+       int             opattrs;
 
-       Debug( LDAP_DEBUG_TRACE, "=> send_search_entry (%s)\n", e->e_dn, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "=> send_search_entry: \"%s\"\n", e->e_dn, 0, 0 );
 
-       if ( ! access_allowed( be, conn, op, e, "entry", NULL, op->o_dn,
-           ACL_READ ) ) {
+       if ( ! access_allowed( be, conn, op, e,
+               "entry", NULL, ACL_READ ) )
+       {
                Debug( LDAP_DEBUG_ACL, "acl: access to entry not allowed\n",
                    0, 0, 0 );
                return( 1 );
        }
 
-#ifdef COMPAT30
-       if ( (ber = ber_alloc_t( conn->c_version == 30 ? 0 : LBER_USE_DER ))
-           == NULLBER ) {
-#else
-       if ( (ber = der_alloc()) == NULLBER ) {
-#endif
+       edn = e->e_ndn;
+
+       ber = ber_alloc_t( LBER_USE_DER );
+
+       if ( ber == NULL ) {
                Debug( LDAP_DEBUG_ANY, "ber_alloc failed\n", 0, 0, 0 );
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
-                   "ber_alloc" );
-               return( 1 );
+               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       NULL, "allocating BER error", NULL, NULL );
+               goto error_return;
        }
 
-#ifdef COMPAT30
-       if ( conn->c_version == 30 ) {
-               rc = ber_printf( ber, "{it{{s{", op->o_msgid,
-                   LDAP_RES_SEARCH_ENTRY, e->e_dn );
-       } else
-#endif
-               rc = ber_printf( ber, "{it{s{", op->o_msgid,
-                   LDAP_RES_SEARCH_ENTRY, e->e_dn );
+       rc = ber_printf( ber, "{it{s{", op->o_msgid,
+               LDAP_RES_SEARCH_ENTRY, e->e_dn );
 
        if ( rc == -1 ) {
                Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
                ber_free( ber, 1 );
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
-                   "ber_printf dn" );
-               return( 1 );
+               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                   NULL, "encoding dn error", NULL, NULL );
+               goto error_return;
        }
 
+       /* check for special all user attributes ("*") type */
+       userattrs = ( attrs == NULL ) ? 1
+               : charray_inlist( attrs, LDAP_ALL_USER_ATTRIBUTES );
+
+       /* check for special all operational attributes ("+") type */
+       opattrs = ( attrs == NULL ) ? 0
+               : charray_inlist( attrs, LDAP_ALL_OPERATIONAL_ATTRIBUTES );
+
        for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
-               if ( attrs != NULL && ! charray_inlist( attrs, a->a_type ) ) {
-                       continue;
+               regmatch_t       matches[MAXREMATCHES];
+
+               if ( attrs == NULL ) {
+                       /* all addrs request, skip operational attributes */
+                       if( !opattrs && oc_check_operational_attr( a->a_type ) ) {
+                               continue;
+                       }
+
+               } else {
+                       /* specific addrs requested */
+                       if (  oc_check_operational_attr( a->a_type ) ) {
+                               if( !opattrs && !charray_inlist( attrs, a->a_type ) )
+                               {
+                                       continue;
+                               }
+                       } else {
+                               if (!userattrs && !charray_inlist( attrs, a->a_type ) )
+                               {
+                                       continue;
+                               }
+                       }
                }
 
-               acl = acl_get_applicable( be, op, e, a->a_type );
+               acl = acl_get_applicable( be, op, e, a->a_type,
+                       MAXREMATCHES, matches );
 
-               if ( ! acl_access_allowed( acl, be, conn, e, NULL, op,
-                   ACL_READ ) ) {
+               if ( ! acl_access_allowed( acl, be, conn, e,
+                       NULL, op, ACL_READ, edn, matches ) ) 
+               {
                        continue;
                }
 
-               if ( ber_printf( ber, "{s[", a->a_type ) == -1 ) {
+               if (( rc = ber_printf( ber, "{s[" /*]}*/ , a->a_type )) == -1 ) {
                        Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
                        ber_free( ber, 1 );
                        send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-                           NULL, "ber_printf type" );
-                       return( 1 );
+                           NULL, "encoding type error", NULL, NULL );
+                       goto error_return;
                }
 
                if ( ! attrsonly ) {
                        for ( i = 0; a->a_vals[i] != NULL; i++ ) {
-                               if ( a->a_syntax & SYNTAX_DN &&
-                                   ! acl_access_allowed( acl, be, conn, e,
-                                   a->a_vals[i], op, ACL_READ ) )
+                               if ( a->a_syntax & SYNTAX_DN && 
+                                       ! acl_access_allowed( acl, be, conn, e, a->a_vals[i], op,
+                                               ACL_READ, edn, matches) )
                                {
                                        continue;
                                }
 
-                               if ( ber_printf( ber, "o",
-                                   a->a_vals[i]->bv_val,
-                                   a->a_vals[i]->bv_len ) == -1 )
-                               {
+                               if (( rc = ber_printf( ber, "O", a->a_vals[i] )) == -1 ) {
                                        Debug( LDAP_DEBUG_ANY,
                                            "ber_printf failed\n", 0, 0, 0 );
                                        ber_free( ber, 1 );
-                                       send_ldap_result( conn, op,
-                                           LDAP_OPERATIONS_ERROR, NULL,
-                                           "ber_printf value" );
-                                       return( 1 );
+                                       send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                                               NULL, "encoding value error", NULL, NULL );
+                                       goto error_return;
                                }
                        }
                }
 
-               if ( ber_printf( ber, "]}" ) == -1 ) {
+               if (( rc = ber_printf( ber, /*{[*/ "]}" )) == -1 ) {
                        Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
                        ber_free( ber, 1 );
                        send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
-                           NULL, "ber_printf type end" );
-                       return( 1 );
+                           NULL, "encode end error", NULL, NULL );
+                       goto error_return;
                }
        }
 
-#ifdef COMPAT30
-       if ( conn->c_version == 30 ) {
-               rc = ber_printf( ber, "}}}}" );
-       } else
+#ifdef SLAPD_SCHEMA_DN
+       /* eventually will loop through generated operational attributes */
+       /* only have subschemaSubentry implemented */
+       a = backend_subschemasubentry( be );
+       
+       do {
+               regmatch_t       matches[MAXREMATCHES];
+
+               if ( attrs == NULL ) {
+                       /* all addrs request, skip operational attributes */
+                       if( !opattrs && oc_check_operational_attr( a->a_type ) ) {
+                               continue;
+                       }
+
+               } else {
+                       /* specific addrs requested */
+                       if (  oc_check_operational_attr( a->a_type ) ) {
+                               if( !opattrs && !charray_inlist( attrs, a->a_type ) )
+                               {
+                                       continue;
+                               }
+                       } else {
+                               if (!userattrs && !charray_inlist( attrs, a->a_type ) )
+                               {
+                                       continue;
+                               }
+                       }
+               }
+
+               acl = acl_get_applicable( be, op, e, a->a_type,
+                       MAXREMATCHES, matches );
+
+               if ( ! acl_access_allowed( acl, be, conn, e,
+                       NULL, op, ACL_READ, edn, matches ) ) 
+               {
+                       continue;
+               }
+
+               if (( rc = ber_printf( ber, "{s[" /*]}*/ , a->a_type )) == -1 ) {
+                       Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
+                       ber_free( ber, 1 );
+                       send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                           NULL, "encoding type error", NULL, NULL );
+                       goto error_return;
+               }
+
+               if ( ! attrsonly ) {
+                       for ( i = 0; a->a_vals[i] != NULL; i++ ) {
+                               if ( a->a_syntax & SYNTAX_DN && 
+                                       ! acl_access_allowed( acl, be, conn, e, a->a_vals[i], op,
+                                               ACL_READ, edn, matches) )
+                               {
+                                       continue;
+                               }
+
+                               if (( rc = ber_printf( ber, "O", a->a_vals[i] )) == -1 ) {
+                                       Debug( LDAP_DEBUG_ANY,
+                                           "ber_printf failed\n", 0, 0, 0 );
+                                       ber_free( ber, 1 );
+                                       send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                                               NULL, "encoding value error", NULL, NULL );
+                                       goto error_return;
+                               }
+                       }
+               }
+
+               if (( rc = ber_printf( ber, /*{[*/ "]}" )) == -1 ) {
+                       Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
+                       ber_free( ber, 1 );
+                       send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                           NULL, "encode end error", NULL, NULL );
+                       goto error_return;
+               }
+       } while (0);
 #endif
-               rc = ber_printf( ber, "}}}" );
+
+       rc = ber_printf( ber, /*{{{*/ "}}}" );
 
        if ( rc == -1 ) {
                Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
                ber_free( ber, 1 );
-               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
-                   "ber_printf entry end" );
+               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       NULL, "encode entry end error", NULL, NULL );
                return( 1 );
        }
 
-       /* write only one pdu at a time - wait til it's our turn */
-       pthread_mutex_lock( &conn->c_pdumutex );
+       bytes = send_ldap_ber( conn, ber );
 
-       bytes = ber->ber_ptr - ber->ber_buf;
-       pthread_mutex_lock( &new_conn_mutex );
-       while ( conn->c_connid == op->o_connid && ber_flush( &conn->c_sb, ber,
-           1 ) != 0 ) {
-               pthread_mutex_unlock( &new_conn_mutex );
-               /*
-                * we got an error.  if it's ewouldblock, we need to
-                * wait on the socket being writable.  otherwise, figure
-                * it's a hard error and return.
-                */
+       if ( bytes < 0 ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "send_ldap_response: ber write failed\n",
+                       0, 0, 0 );
+               return -1;
+       }
 
-               Debug( LDAP_DEBUG_CONNS, "ber_flush failed errno %d msg (%s)\n",
-                   errno, errno > -1 && errno < sys_nerr ? sys_errlist[errno]
-                   : "unknown", 0 );
+       ldap_pvt_thread_mutex_lock( &num_sent_mutex );
+       num_bytes_sent += bytes;
+       num_entries_sent++;
+       num_pdu_sent++;
+       ldap_pvt_thread_mutex_unlock( &num_sent_mutex );
 
-               if ( errno != EWOULDBLOCK && errno != EAGAIN ) {
-                       close_connection( conn, op->o_connid, op->o_opid );
+       Statslog( LDAP_DEBUG_STATS2, "conn=%ld op=%ld ENTRY dn=\"%s\"\n",
+           (long) conn->c_connid, (long) op->o_opid, e->e_dn, 0, 0 );
 
-                       pthread_mutex_unlock( &conn->c_pdumutex );
-                       return( -1 );
+       Debug( LDAP_DEBUG_TRACE, "<= send_search_entry\n", 0, 0, 0 );
+
+       rc = 0;
+
+error_return:;
+       return( rc );
+}
+
+int
+send_search_reference(
+    Backend    *be,
+    Connection *conn,
+    Operation  *op,
+    Entry      *e,
+       struct berval **refs,
+       int scope,
+       LDAPControl **ctrls,
+    struct berval ***v2refs
+)
+{
+       BerElement      *ber;
+       int rc;
+       int bytes;
+
+       Debug( LDAP_DEBUG_TRACE, "=> send_search_reference (%s)\n", e->e_dn, 0, 0 );
+
+       if ( ! access_allowed( be, conn, op, e,
+               "entry", NULL, ACL_READ ) )
+       {
+               Debug( LDAP_DEBUG_ACL,
+                       "send_search_reference: access to entry not allowed\n",
+                   0, 0, 0 );
+               return( 1 );
+       }
+
+       if ( ! access_allowed( be, conn, op, e,
+               "ref", NULL, ACL_READ ) )
+       {
+               Debug( LDAP_DEBUG_ACL,
+                       "send_search_reference: access to reference not allowed\n",
+                   0, 0, 0 );
+               return( 1 );
+       }
+
+       if( refs == NULL ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "send_search_reference: null ref in (%s)\n", 
+                       e->e_dn, 0, 0 );
+               return( 1 );
+       }
+
+       if( op->o_protocol < LDAP_VERSION3 ) {
+               /* save the references for the result */
+               if( *refs == NULL ) {
+                       value_add( v2refs, refs );
                }
+               return 0;
+       }
 
-               /* wait for socket to be write-ready */
-               pthread_mutex_lock( &active_threads_mutex );
-               active_threads--;
-               conn->c_writewaiter = 1;
-               pthread_kill( listener_tid, SIGUSR1 );
-               pthread_cond_wait( &conn->c_wcv, &active_threads_mutex );
-               pthread_mutex_unlock( &active_threads_mutex );
+       ber = ber_alloc_t( LBER_USE_DER );
 
-               pthread_yield();
-               pthread_mutex_lock( &new_conn_mutex );
+       if ( ber == NULL ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "send_search_reference: ber_alloc failed\n", 0, 0, 0 );
+               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       NULL, "alloc BER error", NULL, NULL );
+               return -1;
        }
-       pthread_mutex_unlock( &new_conn_mutex );
-       pthread_mutex_unlock( &conn->c_pdumutex );
 
-       pthread_mutex_lock( &num_sent_mutex );
-       num_bytes_sent += bytes;
-       num_entries_sent++;
-       pthread_mutex_unlock( &num_sent_mutex );
+       rc = ber_printf( ber, "{it{V}}", op->o_msgid,
+               LDAP_RES_SEARCH_REFERENCE, refs );
 
-       pthread_mutex_lock( &new_conn_mutex );
-       if ( conn->c_connid == op->o_connid ) {
-               rc = 0;
-               Statslog( LDAP_DEBUG_STATS2, "conn=%d op=%d ENTRY dn=\"%s\"\n",
-                   conn->c_connid, op->o_opid, e->e_dn, 0, 0 );
-       } else {
-               rc = -1;
+       if ( rc == -1 ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "send_search_reference: ber_printf failed\n", 0, 0, 0 );
+               ber_free( ber, 1 );
+               send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
+                       NULL, "encode dn error", NULL, NULL );
+               return -1;
        }
-       pthread_mutex_unlock( &new_conn_mutex );
 
-       Debug( LDAP_DEBUG_TRACE, "<= send_search_entry\n", 0, 0, 0 );
+       bytes = send_ldap_ber( conn, ber );
 
-       return( rc );
+       ldap_pvt_thread_mutex_lock( &num_sent_mutex );
+       num_bytes_sent += bytes;
+       num_refs_sent++;
+       num_pdu_sent++;
+       ldap_pvt_thread_mutex_unlock( &num_sent_mutex );
+
+       Statslog( LDAP_DEBUG_STATS2, "conn=%ld op=%ld ENTRY dn=\"%s\"\n",
+           (long) conn->c_connid, (long) op->o_opid, e->e_dn, 0, 0 );
+
+       Debug( LDAP_DEBUG_TRACE, "<= send_search_reference\n", 0, 0, 0 );
+
+       return 0;
 }
 
+
 int
 str2result(
     char       *s,
@@ -411,24 +868,3 @@ str2result(
 
        return( rc );
 }
-
-/*
- * close_connection - close a connection. takes the connection to close,
- * the connid associated with the operation generating the close (so we
- * don't accidentally close a connection that's not ours), and the opid
- * of the operation generating the close (for logging purposes).
- */
-void
-close_connection( Connection *conn, int opconnid, int opid )
-{
-       pthread_mutex_lock( &new_conn_mutex );
-       if ( conn->c_sb.sb_sd != -1 && conn->c_connid == opconnid ) {
-               Statslog( LDAP_DEBUG_STATS,
-                   "conn=%d op=%d fd=%d closed errno=%d\n", conn->c_connid,
-                   opid, conn->c_sb.sb_sd, errno, 0 );
-               close( conn->c_sb.sb_sd );
-               conn->c_sb.sb_sd = -1;
-               conn->c_version = 0;
-       }
-       pthread_mutex_unlock( &new_conn_mutex );
-}