--- snmplib/asn1.c.orig.2	Sat Dec 11 00:07:16 2004
+++ snmplib/asn1.c	Thu Feb 24 23:42:30 2005
@@ -181,6 +181,9 @@
 #include <in.h>
 #endif
 
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #if HAVE_DMALLOC_H
 #include <dmalloc.h>
 #endif
@@ -584,6 +587,11 @@
         return NULL;
     }
     integer = *intp;
+    if (intsize > 4) {
+	register u_long signmask = ((u_long)1 << ((8 * sizeof(long)) - 1));
+	register u_long signbit = ((integer & signmask) != 0);
+	integer &= (signbit << 31) | 0x7fffffff;
+    }
     /*
      * Truncate "unnecessary" bytes off of the most significant end of this
      * 2's complement integer.  There should be no sequence of 9
@@ -663,6 +671,9 @@
         return NULL;
     }
     integer = *intp;
+    if (intsize > 4) {
+	integer &= 0xffffffff;
+    }
     mask = ((u_long) 0xFF) << (8 * (sizeof(long) - 1));
     /*
      * mask is 0xFF000000 on a big-endian machine 
@@ -2674,6 +2685,12 @@
         return 0;
     }
 
+    if (intsize > 4) {
+	register u_long signmask = ((u_long)1 << ((8 * sizeof(long)) - 1));
+	register u_long signbit = ((integer & signmask) != 0);
+	integer &= (signbit << 31) | 0x7fffffff;
+    }
+
     if (((*pkt_len - *offset) < 1) && !(r && asn_realloc(pkt, pkt_len))) {
         return 0;
     }
@@ -2823,6 +2840,10 @@
     if (intsize != sizeof(unsigned long)) {
         _asn_size_err(errpre, intsize, sizeof(unsigned long));
         return 0;
+    }
+
+    if (intsize > 4) {
+	integer &= 0xffffffff;
     }
 
     if (((*pkt_len - *offset) < 1) && !(r && asn_realloc(pkt, pkt_len))) {