Diff for /libraries/libldap/result.c between versions 1.124.2.13 and 1.165

version 1.124.2.13, 2008/09/26 22:23:05 version 1.165, 2009/01/24 06:18:35
Line 1 Line 1
 /* result.c - wait for an ldap result */  /* result.c - wait for an ldap result */
 /* $OpenLDAP: pkg/ldap/libraries/libldap/result.c,v 1.124.2.12 2008/07/09 23:16:48 quanah Exp $ */  /* $OpenLDAP: pkg/ldap/libraries/libldap/result.c,v 1.164 2009/01/21 23:40:21 kurt Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *   *
  * Copyright 1998-2008 The OpenLDAP Foundation.   * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
Line 1127  nextresp2: Line 1127  nextresp2:
         if ( msgid == LDAP_RES_ANY || id == msgid ) {          if ( msgid == LDAP_RES_ANY || id == msgid ) {
                 if ( all == LDAP_MSG_ONE                  if ( all == LDAP_MSG_ONE
                         || ( newmsg->lm_msgtype != LDAP_RES_SEARCH_RESULT                          || ( newmsg->lm_msgtype != LDAP_RES_SEARCH_RESULT
                                 && newmsg->lm_msgtype != LDAP_RES_SEARCH_ENTRY                                  && newmsg->lm_msgtype != LDAP_RES_SEARCH_ENTRY
                                   && newmsg->lm_msgtype != LDAP_RES_INTERMEDIATE
                                 && newmsg->lm_msgtype != LDAP_RES_SEARCH_REFERENCE ) )                                  && newmsg->lm_msgtype != LDAP_RES_SEARCH_REFERENCE ) )
                 {                  {
                         *result = newmsg;                          *result = newmsg;
Line 1435  ldap_mark_abandoned( LDAP *ld, ber_int_t Line 1436  ldap_mark_abandoned( LDAP *ld, ber_int_t
   
         /* NOTE: those assertions are repeated in ldap_int_bisect_delete() */          /* NOTE: those assertions are repeated in ldap_int_bisect_delete() */
         assert( idx >= 0 );          assert( idx >= 0 );
         assert( idx < ld->ld_nabandoned );          assert( (unsigned) idx < ld->ld_nabandoned );
         assert( ld->ld_abandoned[ idx ] == msgid );          assert( ld->ld_abandoned[ idx ] == msgid );
   
         return ldap_int_bisect_delete( &ld->ld_abandoned, &ld->ld_nabandoned,          return ldap_int_bisect_delete( &ld->ld_abandoned, &ld->ld_nabandoned,

Removed from v.1.124.2.13  
changed lines
  Added in v.1.165


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org