mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-01 14:15:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

work args of ldap_negotiated_sasl_bind_s() and provide examples

Browse Source 
with authentication id and authorization ids.  Note: this routine
doesn't actually negotiate anything.  It likely should be renamed
ldap_sasl_auth_s() or ldap_sasl_bind_multistep() or something.
This commit is contained in:
Kurt Zeilenga 2000-03-14 02:54:08 +00:00
parent db662b516f
commit 17527368d1
2 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/ldap.h
View File

@ -657,8 +657,8 @@ LIBLDAP_F( int )
ldap_negotiated_sasl_bind_s LDAP_P((
LDAP *ld,
LDAP_CONST char *dn, /* usually NULL */
LDAP_CONST char *authorizationId,
LDAP_CONST char *authenticationId, /* usually NULL */
LDAP_CONST char *authenticationId,
LDAP_CONST char *authorizationId, /* usually NULL */
LDAP_CONST char *saslMechanism,
struct berval *passPhrase,
LDAPControl **serverControls,

58
libraries/libldap/sasl.c
View File

@ -190,14 +190,14 @@ ldap_sasl_bind_s(
rc = ldap_parse_sasl_bind_result( ld, result, &scredp, 0 );
}
if( rc != LDAP_SUCCESS ) {
if ( rc != LDAP_SUCCESS && rc != LDAP_SASL_BIND_IN_PROGRESS ) {
ldap_msgfree( result );
return( rc );
}
rc = ldap_result2error( ld, result, 1 );
if( rc == LDAP_SUCCESS ) {
if ( rc != LDAP_SUCCESS && rc != LDAP_SASL_BIND_IN_PROGRESS ) {
if( servercredp != NULL ) {
*servercredp = scredp;
}
@ -782,35 +782,58 @@ ldap_pvt_sasl_getsimple(void *context, int id, const char **result, int *len)
}
/*
* ldap_negotiated_sasl_bind_s - bind to the ldap server (and X.500) using SASL
* authentication. The dn and password of the entry to which to bind are
* supplied. LDAP_SUCCESS is returned upon success, the ldap error code
* ldap_negotiated_sasl_bind_s - bind to the ldap server (and X.500)
* using SASL authentication.
*
* This routine attempts to authenticate the user referred by the
* authentication id using the provided password. An optional
* authorization identity may be provided. An DN is generally not
* provided [see AuthMethod].
*
* If the mechanism negotiated does not require a password, the
* passwd field is ignored. [A callback mechanism should really
* be used].
*
* LDAP_SUCCESS is returned upon success, the ldap error code
* otherwise.
*
* Example:
* Examples:
* ldap_negotiated_sasl_bind_s( ld, NULL,
* "dn:cn=manager", NULL, "GSSAPI", NULL, NULL, NULL );
* "user@OPENLDAP.ORG", NULL, NULL,
* "GSSAPI", NULL, NULL, NULL );
*
* ldap_negotiated_sasl_bind_s( ld, NULL,
* "manager", "cn=user,dc=openldap,dc=org", NULL,
* "DIGEST-MD5", NULL, NULL, NULL );
*
* ldap_negotiated_sasl_bind_s( ld, NULL,
* "root@OPENLDAP.ORG", "u:user@OPENLDAP.ORG", NULL,
* "GSSAPI", NULL, NULL, NULL );
*
* ldap_negotiated_sasl_bind_s( ld, NULL,
* "manager", "dn:cn=user,dc=openldap,dc=org", NULL,
* "DIGEST-MD5", NULL, NULL, NULL );
*/
int
ldap_negotiated_sasl_bind_s(
LDAP *ld,
LDAP *ld,
LDAP_CONST char *dn, /* usually NULL */
LDAP_CONST char *authorizationId,
LDAP_CONST char *authenticationId,
LDAP_CONST char *saslMechanism,
struct berval *passPhrase,
LDAPControl **serverControls,
LDAPControl **clientControls)
LDAP_CONST char *authenticationId,
LDAP_CONST char *authorizationId, /* commonly NULL */
LDAP_CONST char *saslMechanism,
struct berval *passPhrase,
LDAPControl **serverControls,
LDAPControl **clientControls)
{
sasl_callback_t callbacks[4];
int rc;
callbacks[0].id = SASL_CB_USER;
callbacks[0].proc = ldap_pvt_sasl_getsimple;
callbacks[0].context = (void *)authorizationId;
callbacks[1].context = (void *)authenticationId;
callbacks[1].id = SASL_CB_AUTHNAME;
callbacks[1].proc = ldap_pvt_sasl_getsimple;
callbacks[1].context = (void *)authenticationId;
callbacks[0].context = (void *)authorizationId;
callbacks[2].id = SASL_CB_PASS;
callbacks[2].proc = ldap_pvt_sasl_getsecret;
callbacks[2].context = (void *)passPhrase;
@ -818,7 +841,8 @@ ldap_negotiated_sasl_bind_s(
callbacks[3].proc = NULL;
callbacks[3].context = NULL;
rc = ldap_pvt_sasl_bind(ld, dn, saslMechanism, callbacks, serverControls, clientControls);
rc = ldap_pvt_sasl_bind(ld, dn, saslMechanism, callbacks,
serverControls, clientControls);
return rc;
}