Change the SASL DN's from cn=authzid to cn=auth

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 671e8bbd2c4a371fcb4dc7c2a6ed706c9a8978a9..95faa8f29afda7b045b68dd9e0f86b8e81fe8152 100644 (file)
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -128,7 +128,7 @@ int slap_sasl_getdn( Connection *conn, char *id, char **dnptr, int flags )
        }
 
        /* Username strings */
-       len1  = strlen( ",cn=authzid" );
+       len1  = strlen( ",cn=auth" );
        if( !strncasecmp( dn, "u:", 2 ) ) {
                len += strlen( "dn:uid=" ) + len1;
 
@@ -166,7 +166,7 @@ int slap_sasl_getdn( Connection *conn, char *id, char **dnptr, int flags )
                if( conn->c_sasl_bind_mech ) {
                        len += sprintf( dn+len, ",cn=%s", conn->c_sasl_bind_mech );
                }
-               strcpy( dn+len, ",cn=authzid" );
+               strcpy( dn+len, ",cn=auth" );
                len += len1;
 #ifdef NEW_LOGGING
                LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
@@ -177,7 +177,7 @@ int slap_sasl_getdn( Connection *conn, char *id, char **dnptr, int flags )
 
        }
 
-       /* DN strings that are a cn=authzid identity to run through regexp */
+       /* DN strings that are a cn=auth identity to run through regexp */
        if( !strncasecmp( dn, "dn:", 3) && ( ( flags & FLAG_GETDN_FINAL ) == 0 ) ) {
                c1 = slap_sasl2dn( dn + 3 );
                if( c1 ) {

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index e7dfe22320aef71f4c914ca3290a57aafce85a12..0424497996a0352a3f92f7b5c33975fbf717a116 100644 (file)
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -291,7 +291,7 @@ char *slap_sasl_regexp( char *saslname )
 
 
 /*
- * Given a SASL name (e.g. "UID=name,cn=REALM,cn=MECH,cn=AUTHZID")
+ * Given a SASL name (e.g. "UID=name,cn=REALM,cn=MECH,cn=AUTH")
  * return the LDAP DN to which it matches. The SASL regexp rules in the config
  * file turn the SASL name into an LDAP URI. If the URI is just a DN (or a
  * search with scope=base), just return the URI (or its searchbase). Otherwise