Added dn_rdnlen. Fixed rdn leak in limits.c.

[openldap] / servers / slapd / acl.c

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 7c8a3a0a953b2e1d15fc6ab28e941a4d2fb021f7..193eba4d0c92d66dfdeb0d57f4f2269e0a8bcf89 100644 (file)
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -355,11 +355,7 @@ acl_get(
                                        if ( !DN_SEPARATOR( e->e_ndn[dnlen - patlen - 1] ) || DN_ESCAPE( e->e_ndn[dnlen - patlen - 2] ) )
                                                continue;
 
-                                       rdn = dn_rdn( NULL, e->e_ndn );
-                                       if ( rdn != NULL ) {
-                                               rdnlen = strlen( rdn );
-                                               ch_free( rdn );
-                                       }
+                                       rdnlen = dn_rdnlen( NULL, e->e_ndn );
                                        if ( rdnlen != dnlen - patlen - 1 )
                                                continue;
 
@@ -562,11 +558,7 @@ acl_mask(
                                        if ( !DN_SEPARATOR( op->o_ndn[odnlen - patlen - 1] ) || DN_ESCAPE( op->o_ndn[odnlen - patlen - 2] ) )
                                                continue;
 
-                                       rdn = dn_rdn( NULL, op->o_ndn );
-                                       if ( rdn != NULL ) {
-                                               rdnlen = strlen( rdn );
-                                               ch_free( rdn );
-                                       }
+                                       rdnlen = dn_rdnlen( NULL, op->o_ndn );
                                        if ( rdnlen != odnlen - patlen - 1 )
                                                continue;