int slap_sasl_getdn( Connection *conn, char *id, char **dnptr, int flags )
{
- char *c, *c1, *dn=NULL;
+ char *c=NULL, *c1, *dn=NULL;
int rc, len;
sasl_conn_t *ctx;
/* An authcID needs to be converted to authzID form */
if( flags & FLAG_GETDN_AUTHCID ) {
if( sasl_external_x509dn_convert && conn->c_sasl_bind_mech
- && ( strcasecmp( LDAP_SASL_EXTERNAL, conn->c_sasl_bind_mech ) == 0 )
- && len && dn[0] == '/' and dn[len-1]== '/' )
+ && ( strcasecmp( "EXTERNAL", conn->c_sasl_bind_mech ) == 0 )
+ && len && id[0] == '/' /* && id[len-1]== '/' */)
{
/* check SASL external for X.509 style DN and */
/* convert to dn:<dn> form */
char *tmpdn = ldap_dcedn2dn( id );
len = strlen( tmpdn );
- dn = ch_malloc( dn, len+4 );
+ dn = ch_malloc( len+4 );
dn[0] = 'd';
dn[1] = 'n';
dn[2] = ':';
} else {
/* convert to u:<username> form */
- dn = ch_malloc( dn, len+3 );
+ dn = ch_malloc( len+3 );
dn[0] = 'u';
dn[1] = ':';
memmove( &dn[2], id, len+1 );
}
if( ( flags & FLAG_GETDN_FINAL ) == 0 ) {
- dn_normalize( dn );
+ dn_normalize( dn+3 );
}
*dnptr = dn;
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_authorize: conn %d authorization allowed\n",
- (long)(conn ? conn->c_connid : -1 ) );
+ (long)(conn ? conn->c_connid : -1 ) ));
#else
Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: "
" authorization allowed\n",
#ifdef HAVE_CYRUS_SASL
sasl_conn_t *ctx = conn->c_sasl_context;
struct berval response;
- unsigned reslen;
+ unsigned reslen = 0;
const char *errstr;
int sc;
if ( !conn->c_sasl_bind_in_progress ) {
sc = sasl_server_start( ctx,
conn->c_sasl_bind_mech,
- cred->bv_val, cred->bv_len,
+ cred->bv_len ? cred->bv_val : "",
+ cred->bv_len,
(char **)&response.bv_val, &reslen, &errstr );
} else {