6546495 peruser sparcv9 tests fail due to ASN.1 ber tag corruption

1 files changed, 25 insertions, 1 deletions

diff --git a/usr/src/lib/libldap5/sources/ldap/common/sasl.c b/usr/src/lib/libldap5/sources/ldap/common/sasl.c
index 8dba6d6562..4252da65d5 100644
--- a/usr/src/lib/libldap5/sources/ldap/common/sasl.c
+++ b/usr/src/lib/libldap5/sources/ldap/common/sasl.c
@@ -1,5 +1,25 @@
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -109,7 +129,11 @@ nsldapi_sasl_pktlen( char *buf, int maxbufsize )
 {
 	int	size;
 
+#if defined( _WINDOWS ) || defined( _WIN32 )
 	size = ntohl(*(long *)buf);
+#else
+	size = ntohl(*(uint32_t *)buf);
+#endif
    
 	if ( size < 0 || size > maxbufsize ) {
 		return (-1 );