Index: servers/slapd/ad.c
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/servers/slapd/ad.c,v
retrieving revision 1.74.2.15
retrieving revision 1.74.2.16
diff -u -r1.74.2.15 -r1.74.2.16
--- servers/slapd/ad.c	2 Jan 2007 21:43:54 -0000	1.74.2.15
+++ servers/slapd/ad.c	5 Mar 2007 15:19:00 -0000	1.74.2.16
@@ -1,5 +1,5 @@
 /* ad.c - routines for dealing with attribute descriptions */
-/* $OpenLDAP: pkg/ldap/servers/slapd/ad.c,v 1.74.2.15 2007/01/02 21:43:54 kurt Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/ad.c,v 1.74.2.16 2007/03/05 15:19:00 ando Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
  * Copyright 1998-2007 The OpenLDAP Foundation.
@@ -888,12 +888,14 @@
 	}
 
 	an = ch_realloc( an, ( i + j + 1 ) * sizeof( AttributeName ) );
-	BER_BVZERO( &an[i + j].an_name );
 	anew = an + i;
 	for ( s = ldap_pvt_strtok( str, brkstr, &lasts );
 		s != NULL;
 		s = ldap_pvt_strtok( NULL, brkstr, &lasts ) )
 	{
+		/* put a stop mark */
+		BER_BVZERO( &anew[1].an_name );
+
 		anew->an_desc = NULL;
 		anew->an_oc = NULL;
 		anew->an_oc_exclude = 0;