--- libraries/liblber/decode.c	1999/06/18 21:53:07	1.34
+++ libraries/liblber/decode.c	1999/11/26 22:32:20	1.43
@@ -1,4 +1,5 @@
 /* decode.c - ber input decoding routines */
+/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.42 1999/11/08 18:36:30 kurt Exp $ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -30,7 +31,7 @@
 
 #include "lber-int.h"
 
-static ber_tag_t ber_getnint LDAP_P((
+static ber_len_t ber_getnint LDAP_P((
 	BerElement *ber,
 	ber_int_t *num,
 	ber_len_t len ));
@@ -78,9 +79,8 @@ ber_skip_tag( BerElement *ber, ber_len_t
 {
 	ber_tag_t	tag;
 	unsigned char	lc;
-	ber_len_t	noctets;
-	int		diff;
-	ber_len_t	netlen;
+	ber_len_t	i, noctets;
+	unsigned char netlen[sizeof(ber_len_t)];
 
 	assert( ber != NULL );
 	assert( len != NULL );
@@ -107,21 +107,30 @@ ber_skip_tag( BerElement *ber, ber_len_t
 	 * Next, read the length.  The first byte contains the length of
 	 * the length.  If bit 8 is set, the length is the long form,
 	 * otherwise it's the short form.  We don't allow a length that's
-	 * greater than what we can hold in an unsigned long.
+	 * greater than what we can hold in a ber_len_t.
 	 */
 
-	*len = netlen = 0;
+	*len = 0;
+
 	if ( ber_read( ber, (char *) &lc, 1 ) != 1 )
 		return( LBER_DEFAULT );
+
 	if ( lc & 0x80U ) {
 		noctets = (lc & 0x7fU);
-		if ( noctets > sizeof(ber_len_t) )
+
+		if ( noctets > sizeof(ber_len_t) ) {
 			return( LBER_DEFAULT );
-		diff = sizeof(ber_len_t) - noctets;
-		if ( (unsigned) ber_read( ber, (char *) &netlen + diff, noctets )
-		    != noctets )
+		}
+
+		if( (unsigned) ber_read( ber, netlen, noctets ) != noctets ) {
 			return( LBER_DEFAULT );
-		*len = LBER_LEN_NTOH( netlen );
+		}
+
+		for( i = 0; i < noctets; i++ ) {
+			*len <<= 8;
+			*len |= netlen[i];
+		}
+
 	} else {
 		*len = lc;
 	}
@@ -131,7 +140,7 @@ ber_skip_tag( BerElement *ber, ber_len_t
 
 ber_tag_t
 ber_peek_tag(
-	LDAP_CONST BerElement *ber_in,
+	BerElement *ber_in,
 	ber_len_t *len )
 {
 	ber_tag_t	tag;
@@ -154,7 +163,7 @@ ber_peek_tag(
 	return( tag );
 }
 
-static ber_tag_t
+static ber_len_t
 ber_getnint(
 	BerElement *ber,
 	ber_int_t *num,
@@ -178,7 +187,7 @@ ber_getnint(
 		return( -1 );
 
 	/* read into the low-order bytes of our buffer */
-	if ( (ber_len_t) ber_read( ber, buf, len ) != len ) {
+	if ( (ber_len_t) ber_read( ber, (char *) buf, len ) != len ) {
 		return( -1 );
 	}
 
@@ -215,7 +224,7 @@ ber_get_int(
 	if ( (tag = ber_skip_tag( ber, &len )) == LBER_DEFAULT )
 		return( LBER_DEFAULT );
 
-	if ( (unsigned long) ber_getnint( ber, num, len ) != len )
+	if ( ber_getnint( ber, num, len ) != len )
 		return( LBER_DEFAULT );
 	else
 		return( tag );
@@ -242,7 +251,7 @@ ber_get_stringb(
 	if ( datalen > (*len - 1) )
 		return( LBER_DEFAULT );
 
-	if ( (unsigned long) ber_read( ber, buf, datalen ) != datalen )
+	if ( (ber_len_t) ber_read( ber, buf, datalen ) != datalen )
 		return( LBER_DEFAULT );
 
 	buf[datalen] = '\0';
@@ -289,7 +298,7 @@ ber_get_stringa( BerElement *ber, char *
 	if ( (*buf = (char *) LBER_MALLOC( datalen + 1 )) == NULL )
 		return( LBER_DEFAULT );
 
-	if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen ) {
+	if ( (ber_len_t) ber_read( ber, *buf, datalen ) != datalen ) {
 		LBER_FREE( *buf );
 		*buf = NULL;
 		return( LBER_DEFAULT );
@@ -393,7 +402,7 @@ ber_get_bitstringa(
 		return( LBER_DEFAULT );
 	}
 
-	if ( (unsigned long) ber_read( ber, *buf, datalen ) != datalen ) {
+	if ( (ber_len_t) ber_read( ber, *buf, datalen ) != datalen ) {
 		LBER_FREE( buf );
 		*buf = NULL;
 		return( LBER_DEFAULT );
@@ -469,7 +478,7 @@ ber_tag_t
 ber_next_element(
 	BerElement *ber,
 	ber_len_t *len,
-	char *last )
+	LDAP_CONST char *last )
 {
 	assert( ber != NULL );
 	assert( len != NULL );
@@ -486,21 +495,11 @@ ber_next_element(
 
 /* VARARGS */
 ber_tag_t
-ber_scanf
-#if HAVE_STDARG
-	( BerElement *ber,
+ber_scanf ( BerElement *ber,
 	LDAP_CONST char *fmt,
 	... )
-#else
-	( va_alist )
-va_dcl
-#endif
 {
 	va_list		ap;
-#ifndef HAVE_STDARG
-	BerElement	*ber;
-	char		*fmt;
-#endif
 	LDAP_CONST char		*fmt_reset;
 	char		*last;
 	char		*s, **ss, ***sss;
@@ -512,13 +511,7 @@ va_dcl
 	ber_tag_t	rc, tag;
 	ber_len_t	len;
 
-#ifdef HAVE_STDARG
 	va_start( ap, fmt );
-#else
-	va_start( ap );
-	ber = va_arg( ap, BerElement * );
-	fmt = va_arg( ap, char * );
-#endif
 
 	assert( ber != NULL );
 	assert( fmt != NULL );
@@ -672,13 +665,7 @@ va_dcl
 	     * Error.  Reclaim malloced memory that was given to the caller.
 	     * Set allocated pointers to NULL, "data length" outvalues to 0.
 	     */
-#ifdef HAVE_STDARG
 	    va_start( ap, fmt );
-#else
-	    va_start( ap );
-	    (void) va_arg( ap, BerElement * );
-	    (void) va_arg( ap, char * );
-#endif
 
 	    for ( ; fmt_reset < fmt; fmt_reset++ ) {
 		switch ( *fmt_reset ) {