Return to RE

[openldap] / servers / slapd / ad.c

diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c
index 4c118c4313f84803fdba2ab68ac6f3aba226976f..8c5ea9fb4ee1e139419986e512debe3cf667f857 100644 (file)
--- a/servers/slapd/ad.c
+++ b/servers/slapd/ad.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2009 The OpenLDAP Foundation.
+ * Copyright 1998-2015 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -74,9 +74,11 @@ static int option_count = 1;
 
 static int msad_range_hack = 0;
 
+static int ad_count;
+
 static Attr_option *ad_find_option_definition( const char *opt, int optlen );
 
-static int ad_keystring(
+int ad_keystring(
        struct berval *bv )
 {
        ber_len_t i;
@@ -269,6 +271,7 @@ int slap_bv2ad(
 
                                if( rc == 0 && (unsigned)optlen == tags[i].bv_len ) {
                                        /* duplicate (ignore) */
+                                       ntags--;
                                        goto done;
 
                                } else if ( rc > 0 ||
@@ -382,6 +385,9 @@ done:;
                d2->ad_flags = desc.ad_flags;
                d2->ad_cname.bv_len = desc.ad_type->sat_cname.bv_len;
                d2->ad_tags.bv_len = desc.ad_tags.bv_len;
+               ldap_pvt_thread_mutex_lock( &ad_index_mutex );
+               d2->ad_index = ++ad_count;
+               ldap_pvt_thread_mutex_unlock( &ad_index_mutex );
 
                if (dlen == 0) {
                        d2->ad_cname.bv_val = d2->ad_type->sat_cname.bv_val;
@@ -763,13 +769,15 @@ int slap_bv2undef_ad(
 
                desc->ad_cname.bv_len = bv->bv_len;
                desc->ad_cname.bv_val = (char *)(desc+1);
-               strcpy(desc->ad_cname.bv_val, bv->bv_val);
+               strncpy(desc->ad_cname.bv_val, bv->bv_val, bv->bv_len);
+               desc->ad_cname.bv_val[bv->bv_len] = '\0';
 
                /* canonical to upper case */
                ldap_pvt_str2upper( desc->ad_cname.bv_val );
 
                /* shouldn't we protect this for concurrency? */
                desc->ad_type = at;
+               desc->ad_index = 0;
                ldap_pvt_thread_mutex_lock( &ad_undef_mutex );
                desc->ad_next = desc->ad_type->sat_ad;
                desc->ad_type->sat_ad = desc;
@@ -838,6 +846,9 @@ undef_promote(
                        tmp->ad_next = NULL;
                        /* ad_cname was contiguous, no leak here */
                        tmp->ad_cname = nat->sat_cname;
+                       ldap_pvt_thread_mutex_lock( &ad_index_mutex );
+                       tmp->ad_index = ++ad_count;
+                       ldap_pvt_thread_mutex_unlock( &ad_index_mutex );
                        *n_ad = tmp;
                        n_ad = &tmp->ad_next;
                } else {