--- libraries/liblber/decode.c	2000/04/25 08:42:32	1.46
+++ libraries/liblber/decode.c	2000/06/05 17:22:22	1.52
@@ -1,7 +1,7 @@
 /* decode.c - ber input decoding routines */
-/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.45 1999/12/13 03:54:01 kdz Exp $ */
+/* $OpenLDAP: pkg/ldap/libraries/liblber/decode.c,v 1.51 2000/05/14 01:38:27 kurt Exp $ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* Portions
@@ -56,8 +56,8 @@ ber_get_tag( BerElement *ber )
 		if ( ber_read( ber, (char *) &xbyte, 1 ) != 1 )
 			return( LBER_DEFAULT );
 
-		tag << 8;
-		tag &= 0x00ffUL & (ber_tag_t) xbyte;
+		tag <<= 8;
+		tag |= 0x00ffUL & (ber_tag_t) xbyte;
 
 		if ( ! (xbyte & LBER_MORE_TAG_MASK) )
 			break;
@@ -67,7 +67,6 @@ ber_get_tag( BerElement *ber )
 	if ( i == sizeof(ber_tag_t) )
 		return( LBER_DEFAULT );
 
-	/* want leading, not trailing 0's */
 	return tag;
 }
 
@@ -230,6 +229,14 @@ ber_get_int(
 }
 
 ber_tag_t
+ber_get_enum(
+	BerElement *ber,
+	ber_int_t *num )
+{
+	return ber_get_int( ber, num );
+}
+
+ber_tag_t
 ber_get_stringb(
 	BerElement *ber,
 	char *buf,
@@ -238,10 +245,6 @@ ber_get_stringb(
 	ber_len_t	datalen;
 	ber_tag_t	tag;
 
-#ifdef STR_TRANSLATION
-	char		*transbuf;
-#endif /* STR_TRANSLATION */
-
 	assert( ber != NULL );
 	assert( BER_VALID( ber ) );
 
@@ -255,25 +258,6 @@ ber_get_stringb(
 
 	buf[datalen] = '\0';
 
-#ifdef STR_TRANSLATION
-	if ( datalen > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0
-	    && ber->ber_decode_translate_proc ) {
-		transbuf = buf;
-		++datalen;
-		if ( (*(ber->ber_decode_translate_proc))( &transbuf, &datalen,
-		    0 ) != 0 ) {
-			return( LBER_DEFAULT );
-		}
-		if ( datalen > *len ) {
-			LBER_FREE( transbuf );
-			return( LBER_DEFAULT );
-		}
-		SAFEMEMCPY( buf, transbuf, datalen );
-		LBER_FREE( transbuf );
-		--datalen;
-	}
-#endif /* STR_TRANSLATION */
-
 	*len = datalen;
 	return( tag );
 }
@@ -304,19 +288,6 @@ ber_get_stringa( BerElement *ber, char *
 	}
 	(*buf)[datalen] = '\0';
 
-#ifdef STR_TRANSLATION
-	if ( datalen > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0
-	    && ber->ber_decode_translate_proc ) {
-		++datalen;
-		if ( (*(ber->ber_decode_translate_proc))( buf, &datalen, 1 )
-		    != 0 ) {
-			LBER_FREE( *buf );
-			*buf = NULL;
-			return( LBER_DEFAULT );
-		}
-	}
-#endif /* STR_TRANSLATION */
-
 	return( tag );
 }
 
@@ -353,20 +324,6 @@ ber_get_stringal( BerElement *ber, struc
 	((*bv)->bv_val)[len] = '\0';
 	(*bv)->bv_len = len;
 
-#ifdef STR_TRANSLATION
-	if ( len > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0
-	    && ber->ber_decode_translate_proc ) {
-		++len;
-		if ( (*(ber->ber_decode_translate_proc))( &((*bv)->bv_val),
-		    &len, 1 ) != 0 ) {
-			ber_bvfree( *bv );
-			*bv = NULL;
-			return( LBER_DEFAULT );
-		}
-		(*bv)->bv_len = len - 1;
-	}
-#endif /* STR_TRANSLATION */
-
 	return( tag );
 }
 
@@ -771,17 +728,3 @@ ber_scanf ( BerElement *ber,
 
 	return( rc );
 }
-
-
-#ifdef STR_TRANSLATION
-void
-ber_set_string_translators( BerElement *ber, BERTranslateProc encode_proc,
-	BERTranslateProc decode_proc )
-{
-	assert( ber != NULL );
-	assert( BER_VALID( ber ) );
-
-    ber->ber_encode_translate_proc = encode_proc;
-    ber->ber_decode_translate_proc = decode_proc;
-}
-#endif /* STR_TRANSLATION */