Diff for /libraries/libldap/sasl.c between versions 1.13 and 1.14

version 1.13, 2000/03/14 02:08:46 version 1.14, 2000/03/14 03:08:12
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.12 2000/03/14 01:59:53 kurt Exp $ */  /* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.13 2000/03/14 02:08:46 kurt Exp $ */
 /*  /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.   * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file   * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
Line 37 Line 37
   
   
 /*  /*
  * ldap_sasl_bind - bind to the ldap server (and X.500).  The dn, mechanism, and   * ldap_sasl_bind - bind to the ldap server (and X.500).
  * credentials of the entry to which to bind are supplied.  The message id   * The dn (usually NULL), mechanism, and credentials are provided.
  * of the request initiated is provided upon successful (LDAP_SUCCESS) return.   * The message id of the request initiated is provided upon successful
    * (LDAP_SUCCESS) return.
  *   *
  * Example:   * Example:
  *      ldap_sasl_bind( ld, "cn=manager, o=university of michigan, c=us",   *      ldap_sasl_bind( ld, NULL, "mechanism",
  *          "mechanism", "secret", NULL, NULL, &msgid )   *              cred, NULL, NULL, &msgid )
  */   */
   
 int  int
Line 829  ldap_negotiated_sasl_bind_s( Line 830  ldap_negotiated_sasl_bind_s(
         sasl_callback_t callbacks[4];          sasl_callback_t callbacks[4];
         int rc;          int rc;
   
         /*          /* SASL Authentication Identity */
          * Cyrus uses screwy terms.  The authname is the  
          * SASL "username" or authentication identity.  
          * The user is the authorization identity.  
          */  
   
         callbacks[n=0].id = SASL_CB_AUTHNAME;          callbacks[n=0].id = SASL_CB_AUTHNAME;
         callbacks[n].proc = ldap_pvt_sasl_getsimple;          callbacks[n].proc = ldap_pvt_sasl_getsimple;
         callbacks[n].context = (void *)authenticationId;          callbacks[n].context = (void *)authenticationId;
   
           /* SASL Authorization Identity (userid) */
         if( authorizationId != NULL ) {          if( authorizationId != NULL ) {
                 callbacks[++n].id = SASL_CB_USER;                  callbacks[++n].id = SASL_CB_USER;
                 callbacks[n].proc = ldap_pvt_sasl_getsimple;                  callbacks[n].proc = ldap_pvt_sasl_getsimple;

Removed from v.1.13  
changed lines
  Added in v.1.14


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