Diff for /libraries/libldap/result.c between versions 1.84 and 1.84.2.3

version 1.84, 2003/02/28 12:41:53 version 1.84.2.3, 2003/12/01 00:58:26
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/libraries/libldap/result.c,v 1.83 2003/02/28 11:57:28 hyc Exp $ */  /* result.c - wait for an ldap result */
 /*  /* $OpenLDAP$ */
  * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file   *
    * Copyright 1998-2003 The OpenLDAP Foundation.
    * All rights reserved.
    *
    * Redistribution and use in source and binary forms, with or without
    * modification, are permitted only as authorized by the OpenLDAP
    * Public License.
    *
    * A copy of this license is available in the file LICENSE in the
    * top-level directory of the distribution or, alternatively, at
    * <http://www.OpenLDAP.org/license.html>.
  */   */
 /*  Portions  /* Portions Copyright (c) 1990 Regents of the University of Michigan.
  *  Copyright (c) 1990 Regents of the University of Michigan.   * All rights reserved.
  *  All rights reserved.  
  */   */
 /*---  /* This notice applies to changes, created by or for Novell, Inc.,
  * This notice applies to changes, created by or for Novell, Inc.,  
  * to preexisting works for which notices appear elsewhere in this file.   * to preexisting works for which notices appear elsewhere in this file.
  *   *
  * Copyright (C) 1999, 2000 Novell, Inc. All Rights Reserved.   * Copyright (C) 1999, 2000 Novell, Inc. All Rights Reserved.
Line 24 Line 32
  *---   *---
  * Modification to OpenLDAP source by Novell, Inc.   * Modification to OpenLDAP source by Novell, Inc.
  * April 2000 sfs Add code to process V3 referrals and search results   * April 2000 sfs Add code to process V3 referrals and search results
  *   *---
  *  result.c - wait for an ldap result   * Note: A verbatim copy of version 2.0.1 of the OpenLDAP Public License 
  */  
 /* Note: A verbatim copy of version 2.0.1 of the OpenLDAP Public License   
  * can be found in the file "build/LICENSE-2.0.1" in this distribution   * can be found in the file "build/LICENSE-2.0.1" in this distribution
  * of OpenLDAP Software.   * of OpenLDAP Software.
  */   */
   /* Portions Copyright (C) The Internet Society (1997)
    * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
    */
   
 /*  /*
  * LDAPv3 (RFC2251)   * LDAPv3 (RFC2251)
Line 185  chkResponseList( Line 194  chkResponseList(
                         for ( tmp = lm; tmp != NULL; tmp = tmp->lm_chain ) {                          for ( tmp = lm; tmp != NULL; tmp = tmp->lm_chain ) {
                                 if ( tmp->lm_msgtype != LDAP_RES_SEARCH_ENTRY                                  if ( tmp->lm_msgtype != LDAP_RES_SEARCH_ENTRY
                                     && tmp->lm_msgtype != LDAP_RES_SEARCH_REFERENCE                                      && tmp->lm_msgtype != LDAP_RES_SEARCH_REFERENCE
                                         && tmp->lm_msgtype != LDAP_RES_EXTENDED_PARTIAL )                                          && tmp->lm_msgtype != LDAP_RES_INTERMEDIATE )
                                 {                                  {
                                         break;                                          break;
                                 }                                  }
Line 660  nextresp2: Line 669  nextresp2:
          * go through the following code.  This code also chases V2 referrals           * go through the following code.  This code also chases V2 referrals
          * and checks if all referrals have been chased.           * and checks if all referrals have been chased.
          */           */
         if ( (tag != LDAP_RES_SEARCH_ENTRY) && (v3ref > -1)          if ( (tag != LDAP_RES_SEARCH_ENTRY) && (v3ref > -1) &&
 #ifdef LDAP_RES_INTERMEDIATE_RESP                  (tag != LDAP_RES_INTERMEDIATE ))
                 && (tag != LDAP_RES_INTERMEDIATE_RESP )          {
 #endif  
         ) {  
                 /* For a v3 search referral/reference, only come here if already chased it */                  /* For a v3 search referral/reference, only come here if already chased it */
                 if ( ld->ld_version >= LDAP_VERSION2 &&                  if ( ld->ld_version >= LDAP_VERSION2 &&
                         ( lr->lr_parent != NULL ||                          ( lr->lr_parent != NULL ||
Line 957  lr->lr_res_matched ? lr->lr_res_matched Line 964  lr->lr_res_matched ? lr->lr_res_matched
         for ( tmp = l; (tmp->lm_chain != NULL) &&          for ( tmp = l; (tmp->lm_chain != NULL) &&
                 ((tmp->lm_chain->lm_msgtype == LDAP_RES_SEARCH_ENTRY) ||                  ((tmp->lm_chain->lm_msgtype == LDAP_RES_SEARCH_ENTRY) ||
                  (tmp->lm_chain->lm_msgtype == LDAP_RES_SEARCH_REFERENCE) ||                   (tmp->lm_chain->lm_msgtype == LDAP_RES_SEARCH_REFERENCE) ||
                          (tmp->lm_chain->lm_msgtype == LDAP_RES_EXTENDED_PARTIAL ));                           (tmp->lm_chain->lm_msgtype == LDAP_RES_INTERMEDIATE ));
             tmp = tmp->lm_chain )              tmp = tmp->lm_chain )
                 ;       /* NULL */                  ;       /* NULL */
         tmp->lm_chain = new;          tmp->lm_chain = new;
Line 1109  char * ldap_int_msgtype2str( ber_tag_t t Line 1116  char * ldap_int_msgtype2str( ber_tag_t t
         case LDAP_RES_COMPARE: return "compare";          case LDAP_RES_COMPARE: return "compare";
         case LDAP_RES_DELETE: return "delete";          case LDAP_RES_DELETE: return "delete";
         case LDAP_RES_EXTENDED: return "extended-result";          case LDAP_RES_EXTENDED: return "extended-result";
         case LDAP_RES_EXTENDED_PARTIAL: return "extended-partial";          case LDAP_RES_INTERMEDIATE: return "intermediate";
         case LDAP_RES_MODIFY: return "modify";          case LDAP_RES_MODIFY: return "modify";
         case LDAP_RES_RENAME: return "rename";          case LDAP_RES_RENAME: return "rename";
         case LDAP_RES_SEARCH_ENTRY: return "search-entry";          case LDAP_RES_SEARCH_ENTRY: return "search-entry";

Removed from v.1.84  
changed lines
  Added in v.1.84.2.3


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