Diff for /servers/slapd/saslauthz.c between versions 1.144.2.14 and 1.144.2.15

version 1.144.2.14, 2006/05/09 17:29:12 version 1.144.2.15, 2006/11/11 22:41:08
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/servers/slapd/saslauthz.c,v 1.144.2.13 2006/01/03 22:16:15 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/servers/slapd/saslauthz.c,v 1.144.2.14 2006/05/09 17:29:12 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-2006 The OpenLDAP Foundation.   * Copyright 1998-2006 The OpenLDAP Foundation.
Line 1607  static int sasl_sc_smatch( Operation *o, Line 1607  static int sasl_sc_smatch( Operation *o,
 {  {
         smatch_info *sm = o->o_callback->sc_private;          smatch_info *sm = o->o_callback->sc_private;
   
         if ( rs->sr_type != REP_SEARCH ) {          if (rs->sr_type != REP_SEARCH) return 0;
                 if ( rs->sr_err != LDAP_SUCCESS ) {  
                         sm->match = -1;  
                 }  
                 return 0;  
         }  
   
         if ( sm->match == 1 ) {  
                 sm->match = -1;  
                 return 0;  
         }  
   
         if (dn_match(sm->dn, &rs->sr_entry->e_nname)) {          if (dn_match(sm->dn, &rs->sr_entry->e_nname)) {
                 sm->match = 1;                  sm->match = 1;
                   return LDAP_UNAVAILABLE;        /* short-circuit the search */
         } else {  
                 sm->match = -1;  
         }          }
   
         return 0;          return 0;
Line 1849  exact_match: Line 1837  exact_match:
   
         op.o_bd->be_search( &op, &rs );          op.o_bd->be_search( &op, &rs );
   
         if (sm.match == 1) {          if (sm.match) {
                 rc = LDAP_SUCCESS;                  rc = LDAP_SUCCESS;
         } else {          } else {
                 rc = LDAP_INAPPROPRIATE_AUTH;                  rc = LDAP_INAPPROPRIATE_AUTH;

Removed from v.1.144.2.14  
changed lines
  Added in v.1.144.2.15


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