ITS#1716 is_entry_subentr/ies/y/

[openldap] / servers / slapd / sasl.c

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index f42a13de13586c11b5f7f5bedfe3a8d84dca733f..18d2847f6c1aece35be9628e2d50f9d2b8074fa4 100644 (file)
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -225,7 +225,7 @@ int slap_sasl_getdn( Connection *conn, char *id,
                p = slap_strcopy( p, c1 );
                ch_free( c1 );
 
-               if( user_realm ) {
+               if( user_realm && *user_realm ) {
                        p = slap_strcopy( p, ",cn=" );
                        p = slap_strcopy( p, user_realm );
                }
@@ -306,6 +306,8 @@ slap_sasl_checkpass(
        cred.bv_val = (char *)pass;
        cred.bv_len = passlen;
 
+       /* XXX do we need to check sasldb as well? */
+
        /* XXX can we do both steps at once? */
        rc = slap_sasl_getdn( conn, (char *)username, NULL, &dn,
                FLAG_GETDN_AUTHCID | FLAG_GETDN_FINAL );