- dn = ch_realloc( dn, len+3 );
- memmove( dn+2, dn, len+1 );
- dn[0] = 'u';
- dn[1] = ':';
- len += 2;
+ if( sasl_external_x509dn_convert && conn->c_sasl_bind_mech
+ && ( 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( len+4 );
+ dn[0] = 'd';
+ dn[1] = 'n';
+ dn[2] = ':';
+ AC_MEMCPY( &dn[3], tmpdn, len+1 );
+ len += 3;
+
+ } else {
+ /* convert to u:<username> form */
+ dn = ch_malloc( len+3 );
+ dn[0] = 'u';
+ dn[1] = ':';
+ AC_MEMCPY( &dn[2], id, len+1 );
+ len += 2;
+ }
+ } else {
+ dn = ch_strdup( id );