libraries/libldap/sasl.c - diff

Return to sasl.c CVS log

Up to [OpenLDAP] / libraries / libldap

Diff for /libraries/libldap/sasl.c between versions 1.11 and 1.12

version 1.11, 2000/03/14 01:54:08	version 1.12, 2000/03/14 01:59:53
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.10 2000/02/01 22:34:16 lukeh Exp $ */	/* $OpenLDAP: pkg/ldap/libraries/libldap/sasl.c,v 1.11 2000/03/14 01:54:08 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 825 ldap_negotiated_sasl_bind_s(	Line 825 ldap_negotiated_sasl_bind_s(
LDAPControl **serverControls,	LDAPControl **serverControls,
LDAPControl **clientControls)	LDAPControl **clientControls)
{	{
	int n;
sasl_callback_t callbacks[4];	sasl_callback_t callbacks[4];
int rc;	int rc;

callbacks[0].id = SASL_CB_USER;	callbacks[n=0].id = SASL_CB_USER;
callbacks[0].proc = ldap_pvt_sasl_getsimple;	callbacks[n].proc = ldap_pvt_sasl_getsimple;
callbacks[1].context = (void *)authenticationId;	callbacks[n].context = (void *)authenticationId;
callbacks[1].id = SASL_CB_AUTHNAME;
callbacks[1].proc = ldap_pvt_sasl_getsimple;	if( authorizationId != NULL ) {
callbacks[0].context = (void *)authorizationId;	callbacks[++n].id = SASL_CB_AUTHNAME;
callbacks[2].id = SASL_CB_PASS;	callbacks[n].proc = ldap_pvt_sasl_getsimple;
callbacks[2].proc = ldap_pvt_sasl_getsecret;	callbacks[n].context = (void *)authorizationId;
callbacks[2].context = (void *)passPhrase;	}
callbacks[3].id = SASL_CB_LIST_END;
callbacks[3].proc = NULL;	callbacks[++n].id = SASL_CB_PASS;
callbacks[3].context = NULL;	callbacks[n].proc = ldap_pvt_sasl_getsecret;
	callbacks[n].context = (void *)passPhrase;

	callbacks[++n].id = SASL_CB_LIST_END;
	callbacks[n].proc = NULL;
	callbacks[n].context = NULL;

rc = ldap_pvt_sasl_bind(ld, dn, saslMechanism, callbacks,	rc = ldap_pvt_sasl_bind(ld, dn, saslMechanism, callbacks,
serverControls, clientControls);	serverControls, clientControls);

Removed from v.1.11
changed lines
	Added in v.1.12