A search requesting 'cn;lang-en-' did not find 'cn;lang-en'.

diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c
index 9740fb0fdf0468d093a9e9a54b19a8bfc922acf8..75a55e4769950ff299faca0ed19b0b65c910b3fd 100644 (file)
--- a/servers/slapd/ad.c
+++ b/servers/slapd/ad.c
@@ -385,8 +385,11 @@ static int is_ad_sublang(
                        subdelimp = strchrlen( subp, ';', &sublen );
                        if( subdelimp ) subdelimp++;
 
-                       if ((( suplen < sublen && supp[suplen-1] == '-' ) ||
-                               suplen == sublen ) && strncmp( supp, subp, suplen ) == 0 )
+                       if ( suplen > sublen
+                                ? ( suplen-1 == sublen && supp[suplen-1] == '-'
+                                        && strncmp( supp, subp, sublen ) == 0 )
+                                : ( ( suplen == sublen || supp[suplen-1] == '-' )
+                                        && strncmp( supp, subp, suplen ) == 0 ) )
                        {
                                goto match;
                        }