From: hno <>
Date: Wed, 13 Feb 2002 09:40:33 +0000 (+0000)
Subject: OOps.. cut a bit too hard here..
X-Git-Tag: SQUID_3_0_PRE1~1191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2dcd1b0d62ac1d78f4ea161c90862c28f803695;p=thirdparty%2Fsquid.git

OOps.. cut a bit too hard here..
---

diff --git a/include/snmp_pdu.h b/include/snmp_pdu.h
index 1c4658ff8f..07bc7a0e0e 100644
--- a/include/snmp_pdu.h
+++ b/include/snmp_pdu.h
@@ -25,7 +25,7 @@
  * 
  * Author: Ryan Troll <ryan+@andrew.cmu.edu>
  * 
- * $Id: snmp_pdu.h,v 1.8 2002/02/13 02:34:37 hno Exp $
+ * $Id: snmp_pdu.h,v 1.9 2002/02/13 02:40:33 hno Exp $
  * 
  **********************************************************************/
 
@@ -80,7 +80,9 @@ void snmp_add_null_var(struct snmp_pdu *, oid *, int);
 #ifdef UNUSED_CODE
 #define SNMP_PDU_SET        (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x3)
 #define TRP_REQ_MSG	    (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x4)	/*Obsolete */
+#endif
 #define SNMP_PDU_GETBULK    (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x5)
+#ifdef UNUSED_CODE
 #define SNMP_PDU_INFORM     (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x6)
 #define SNMP_PDU_V2TRAP     (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x7)
 #define SNMP_PDU_REPORT     (ASN_CONTEXT | ASN_CONSTRUCTOR | 0x8)
diff --git a/snmplib/coexistance.c b/snmplib/coexistance.c
index 1257d819df..029b1ab352 100644
--- a/snmplib/coexistance.c
+++ b/snmplib/coexistance.c
@@ -115,14 +115,12 @@ snmp_coexist_V2toV1(struct snmp_pdu *PDU)
 	return (1);
 	break;
 
-#ifdef SNMP_PDU_GETBULK
     case SNMP_PDU_GETBULK:
 	PDU->non_repeaters = 0;
 	PDU->max_repetitions = 0;
 	PDU->command = SNMP_PDU_GETNEXT;
 	return (1);
 	break;
-#endif
 
     default:
 	snmplib_debug(2, "Unable to translate PDU %d to SNMPv1!\n", PDU->command);
diff --git a/snmplib/snmp_pdu.c b/snmplib/snmp_pdu.c
index e5b8bb0def..6890ccc0c7 100644
--- a/snmplib/snmp_pdu.c
+++ b/snmplib/snmp_pdu.c
@@ -405,7 +405,6 @@ snmp_pdu_encode(u_char * DestBuf, int *DestBufLen,
 
 /**********************************************************************/
 
-#ifdef SNMP_PDU_GETBULK
     case SNMP_PDU_GETBULK:
 
 	/* SNMPv2 Bulk Request */
@@ -434,7 +433,6 @@ snmp_pdu_encode(u_char * DestBuf, int *DestBufLen,
 	    return (NULL);
 	break;
 
-#endif
 /**********************************************************************/
 
     default:
@@ -563,7 +561,6 @@ snmp_pdu_decode(u_char * Packet,	/* data */
 
 /**********************************************************************/
 
-#ifdef SNMP_PDU_GETBULK
     case SNMP_PDU_GETBULK:
 
 	/* SNMPv2 Bulk Request */
@@ -589,7 +586,6 @@ snmp_pdu_decode(u_char * Packet,	/* data */
 	if (bufp == NULL)
 	    ASN_PARSE_ERROR(NULL);
 	break;
-#endif
 
 /**********************************************************************/