OOps.. cut a bit too hard here..

diff --git a/include/snmp_pdu.h b/include/snmp_pdu.h
index 1c4658ff8f08b686cd1d61c567ceb3fdbc09c365..07bc7a0e0effbc3895249dfb669b1ae1b2de04bd 100644 (file)
--- 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 1257d819dff2c0b716a4749c270f013856517803..029b1ab3529bd0130a2002d5c31ddc200145c160 100644 (file)
--- 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 e5b8bb0def276e841b203578ada3aeacb52e270c..6890ccc0c7481f5ac84a70b0a4452f68d8929ce9 100644 (file)
--- 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
 
 /**********************************************************************/