ITS#6467, use memcpy instead for strcpy when copying across array

[openldap] / servers / slapd / zn_malloc.c

diff --git a/servers/slapd/zn_malloc.c b/servers/slapd/zn_malloc.c
index 2617063137c2d674f6fbc351acac8f27ed56a16c..adbb726d4ddb0604f5dc812c670fb3441dcb2240 100644 (file)
--- a/servers/slapd/zn_malloc.c
+++ b/servers/slapd/zn_malloc.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$*/
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2006 The OpenLDAP Foundation.
+ * Copyright 2003-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -13,15 +13,15 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
-/* Copyright 2004 IBM Corporation
+/* Portions Copyright 2004 IBM Corporation
  * All rights reserved.
- * Redisribution and use in source and binary forms, with or without
- * modification, are permitted only as  authorizd by the OpenLADP
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
  * Public License.
  */
 /* ACKNOWLEDGEMENTS
- * This work originally developed by Jong-Hyuk Choi
- * 2004/12/09   jongchoi@OpenLDAP.org
+ * This work originally developed by Jong-Hyuk Choi for inclusion in
+ * OpenLDAP Software.
  */
 
 #include "portable.h"
@@ -329,7 +329,7 @@ retry:
                if ( zh->zh_maxzones < zh->zh_numzones + zh->zh_deltazones ) {
                        ldap_pvt_thread_mutex_unlock( &zh->zh_mutex );
                        Debug( LDAP_DEBUG_TRACE,
-                               "slap_zn_malloc of %lu bytes failed, using ch_malloc\n",
+                               "slap_zn_malloc of %lu bytes falling back to ch_malloc\n",
                                (long)size, 0, 0);
                        Debug(LDAP_DEBUG_NONE,
                                "slap_zn_malloc: returning 0x%x, 0x%x\n",