Diff for /libraries/libldap/result.c between versions 1.124.2.21 and 1.166

version 1.124.2.21, 2010/04/13 20:22:59 version 1.166, 2009/02/10 08:51:31
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.20 2009/11/18 17:04:31 quanah Exp $ */  /* $OpenLDAP: pkg/ldap/libraries/libldap/result.c,v 1.165 2009/01/24 06:18:35 hyc 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-2010 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 106  ldap_result( Line 106  ldap_result(
         struct timeval *timeout,          struct timeval *timeout,
         LDAPMessage **result )          LDAPMessage **result )
 {  {
           LDAPMessage     *lm;
         int             rc;          int             rc;
   
         assert( ld != NULL );          assert( ld != NULL );
Line 276  wait4msg( Line 277  wait4msg(
         }          }
 #endif /* LDAP_DEBUG */  #endif /* LDAP_DEBUG */
   
         if ( timeout != NULL && timeout->tv_sec != -1 ) {          if ( timeout != NULL ) {
                 tv0 = *timeout;                  tv0 = *timeout;
                 tv = *timeout;                  tv = *timeout;
                 tvp = &tv;                  tvp = &tv;
Line 845  nextresp2: Line 846  nextresp2:
                                 return( -1 );   /* fatal error */                                  return( -1 );   /* fatal error */
                         }                          }
                         lr->lr_res_errno = LDAP_SUCCESS; /* sucessfully chased referral */                          lr->lr_res_errno = LDAP_SUCCESS; /* sucessfully chased referral */
                         if ( lr->lr_res_matched ) {  
                                 LDAP_FREE( lr->lr_res_matched );  
                                 lr->lr_res_matched = NULL;  
                         }  
   
                 } else {                  } else {
                         if ( lr->lr_outrefcnt <= 0 && lr->lr_parent == NULL ) {                          if ( lr->lr_outrefcnt <= 0 && lr->lr_parent == NULL ) {
Line 1387  ldap_abandoned( LDAP *ld, ber_int_t msgi Line 1384  ldap_abandoned( LDAP *ld, ber_int_t msgi
   
         assert( idxp != NULL );          assert( idxp != NULL );
         assert( msgid >= 0 );          assert( msgid >= 0 );
           assert( ld->ld_nabandoned >= 0 );
   
         return ldap_int_bisect_find( ld->ld_abandoned, ld->ld_nabandoned, msgid, idxp );          return ldap_int_bisect_find( ld->ld_abandoned, ld->ld_nabandoned, msgid, idxp );
 }  }

Removed from v.1.124.2.21  
changed lines
  Added in v.1.166


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