switch to openldap-data directory

[openldap] / servers / slapd / ad.c

diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c
index 3cb1806d35b167c2bdc5353b3704b63f84779568..41c6dcb5a95cd59c23dc5fe237fdffb1253d4fc8 100644 (file)
--- a/servers/slapd/ad.c
+++ b/servers/slapd/ad.c
@@ -102,7 +102,6 @@ int slap_bv2ad(
        AttributeDescription desc, *d2;
        char *name, *options;
        char *opt, *next;
-       char *s, *ptr;
        int nlang;
        int langlen;
 
@@ -201,14 +200,15 @@ int slap_bv2ad(
                                int rc;
 
                                rc = strncasecmp( opt, langs[i].bv_val,
-                                       optlen < langs[i].bv_len ? optlen : langs[i].bv_len );
+                                       (unsigned) optlen < langs[i].bv_len
+                                               ? optlen : langs[i].bv_len );
 
-                               if( rc == 0 && optlen == langs[i].bv_len ) {
+                               if( rc == 0 && (unsigned)optlen == langs[i].bv_len ) {
                                        /* duplicate (ignore) */
                                        goto done;
 
                                } else if ( rc > 0 ||
-                                       ( rc == 0 && optlen > langs[i].bv_len ))
+                                       ( rc == 0 && (unsigned)optlen > langs[i].bv_len ))
                                {
                                        AC_MEMCPY( &langs[i+1], &langs[i],
                                                (nlang-i)*sizeof(struct berval) );
@@ -350,7 +350,6 @@ done:;
                        d2->ad_next = desc.ad_type->sat_ad->ad_next;
                        desc.ad_type->sat_ad->ad_next = d2;
                }
-               free(desc.ad_lang.bv_val);
                ldap_pvt_thread_mutex_unlock( &desc.ad_type->sat_ad_mutex );
        }