Happy New Year

[openldap] / servers / slapd / ad.c

diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c
index 71ea438a27f23d3cd8cf70df8ab711b7b017eeb7..3fd62fa7f9bf0a81a383af3ab32a93a141658b58 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-2013 The OpenLDAP Foundation.
+ * Copyright 1998-2018 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -271,6 +271,7 @@ int slap_bv2ad(
 
                                if( rc == 0 && (unsigned)optlen == tags[i].bv_len ) {
                                        /* duplicate (ignore) */
+                                       ntags--;
                                        goto done;
 
                                } else if ( rc > 0 ||
@@ -768,7 +769,8 @@ 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 );