Diff for /libraries/libldap/result.c between versions 1.41 and 1.42

version 1.41, 2000/05/13 00:38:39 version 1.42, 2000/05/25 23:11:18
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/libraries/libldap/result.c,v 1.40 1999/11/30 12:32:06 hyc Exp $ */  /* $OpenLDAP: pkg/ldap/libraries/libldap/result.c,v 1.41 2000/05/13 00:38:39 kurt Exp $ */
 /*  /*
  * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.   * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file   * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
Line 114  ldap_result( Line 114  ldap_result(
                 if ( msgid == LDAP_RES_ANY || lm->lm_msgid == msgid ) {                  if ( msgid == LDAP_RES_ANY || lm->lm_msgid == msgid ) {
                         LDAPMessage     *tmp;                          LDAPMessage     *tmp;
   
                         if ( all == 0                          if ( all == LDAP_MSG_ONE
                             || (lm->lm_msgtype != LDAP_RES_SEARCH_RESULT                              || (lm->lm_msgtype != LDAP_RES_SEARCH_RESULT
                             && lm->lm_msgtype != LDAP_RES_SEARCH_REFERENCE      /* LDAPv3 */                              && lm->lm_msgtype != LDAP_RES_SEARCH_REFERENCE      /* LDAPv3 */
                             && lm->lm_msgtype != LDAP_RES_SEARCH_ENTRY) )                              && lm->lm_msgtype != LDAP_RES_SEARCH_ENTRY) )
Line 138  ldap_result( Line 138  ldap_result(
         }          }
   
         if ( lastlm == NULL ) {          if ( lastlm == NULL ) {
                 ld->ld_responses = (all == 0 && lm->lm_chain != NULL                  ld->ld_responses = (all == LDAP_MSG_ONE && lm->lm_chain != NULL
                     ? lm->lm_chain : lm->lm_next);                      ? lm->lm_chain : lm->lm_next);
         } else {          } else {
                 lastlm->lm_next = (all == 0 && lm->lm_chain != NULL                  lastlm->lm_next = (all == LDAP_MSG_ONE && lm->lm_chain != NULL
                     ? lm->lm_chain : lm->lm_next);                      ? lm->lm_chain : lm->lm_next);
         }          }
         if ( all == 0 && lm->lm_chain != NULL )          if ( all == LDAP_MSG_ONE && lm->lm_chain != NULL )
         {          {
                 lm->lm_chain->lm_next = lm->lm_next;                  lm->lm_chain->lm_next = lm->lm_next;
                 lm->lm_chain = NULL;                  lm->lm_chain = NULL;
Line 477  lr->lr_res_matched ? lr->lr_res_matched Line 477  lr->lr_res_matched ? lr->lr_res_matched
   
         /* is this the one we're looking for? */          /* is this the one we're looking for? */
         if ( msgid == LDAP_RES_ANY || id == msgid ) {          if ( msgid == LDAP_RES_ANY || id == msgid ) {
                 if ( all == 0                  if ( all == LDAP_MSG_ONE
                     || (new->lm_msgtype != LDAP_RES_SEARCH_RESULT                      || (new->lm_msgtype != LDAP_RES_SEARCH_RESULT
                     && new->lm_msgtype != LDAP_RES_SEARCH_ENTRY) ) {                      && new->lm_msgtype != LDAP_RES_SEARCH_ENTRY) ) {
                         *result = new;                          *result = new;

Removed from v.1.41  
changed lines
  Added in v.1.42


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