Merge branch 'V5-7-patches'

* V5-7-patches:
  make python client build with --enable-read-only
  CHANGES: snmpd: BUG: 2846: fix agent compile when both --enable-read-only and --disable-set-support are given.
  CHANGES: snmpd: BUG: 2845: fix compilation error with NETSNMP_NO_WRITE_SUPPORT
  CHANGES: snmpd: BUG: 2810: from "Minzhuan Gong": fix compile with --enable-read-only

Author: fenner

agent/helpers/table.c

@@ -491,8 +491,9 @@ table_helper_handler(netsnmp_mib_handler *handler,
                 if (reqinfo->mode == MODE_SET_RESERVE1)
                     table_helper_cleanup(reqinfo, request,
                                          SNMP_ERR_NOTWRITABLE);
-                else if (reqinfo->mode == MODE_GET)
+                else
 #endif /* NETSNMP_NO_WRITE_SUPPORT */
+                if (reqinfo->mode == MODE_GET)
                     table_helper_cleanup(reqinfo, request,
                                          SNMP_NOSUCHOBJECT);
                 else

agent/snmp_agent.c

@@ -1970,7 +1970,10 @@ netsnmp_wrap_up_request(netsnmp_agent_session *asp, int status)
          *  types to throw an error for a v1 query.
          *  See RFC2576 - section 4.1.2.3
          */
-        if ((asp->pdu->command != SNMP_MSG_SET) &&
+        if (
+#ifndef NETSNMP_NO_WRITE_SUPPORT
+            (asp->pdu->command != SNMP_MSG_SET) &&
+#endif /* NETSNMP_NO_WRITE_SUPPORT */
             (asp->pdu->version == SNMP_VERSION_1)) {
             netsnmp_variable_list *var_ptr = asp->pdu->variables;
             int                    i = 1;
@@ -2211,15 +2214,15 @@ handle_snmp_packet(int op, netsnmp_session * session, int reqid,
         status = asp->status;
     }
 
-#ifdef NETSNMP_DISABLE_SET_SUPPORT
+#if defined(NETSNMP_DISABLE_SET_SUPPORT) && !defined(NETSNMP_NO_WRITE_SUPPORT)
     if (pdu->command == SNMP_MSG_SET) {
         /** Silvercreek protocol tests send set with 0 varbinds */
         if (NULL == pdu->variables)
             return netsnmp_wrap_up_request(asp, SNMP_ERR_NOERROR);
         asp->index = 1;
         return netsnmp_wrap_up_request(asp, SNMP_ERR_NOTWRITABLE);
     }
-#endif /* NETSNMP_DISABLE_SET_SUPPORT */
+#endif /* NETSNMP_DISABLE_SET_SUPPORT && !NETSNMP_NO_WRITE_SUPPORT */
 
     if ((access_ret = check_access(asp->pdu)) != 0) {
         if (access_ret == VACM_NOSUCHCONTEXT) {

python/netsnmp/client_intf.c

@@ -45,7 +45,6 @@ typedef netsnmp_session SnmpSession;
 typedef struct tree SnmpMibNode;
 static int __is_numeric_oid (char*);
 static int __is_leaf (struct tree*);
-static int __translate_appl_type (const char *);
 static int __translate_asn_type (int);
 static int __snprint_value (char **, size_t *,
                             netsnmp_variable_list*, struct tree *,
@@ -56,8 +55,6 @@ static int __get_type_str (int, char *);
 static int __get_label_iid (char *, char **, char **, int);
 static struct tree * __tag2oid (char *, char *, oid  *, int  *, int *, int);
 static int __concat_oid_str (oid *, int *, char *);
-static int __add_var_val_str (netsnmp_pdu *, oid *, int, char *,
-                                 int, int);
 #define USE_NUMERIC_OIDS 0x08
 #define NON_LEAF_NAME 0x04
 #define USE_LONG_NAMES 0x02
@@ -140,6 +137,7 @@ static const struct type_table_entry type_table[] = {
     { }
 };
 
+#ifndef NETSNMP_NO_WRITE_SUPPORT
 static int
 __translate_appl_type(const char *typestr)
 {
@@ -156,6 +154,7 @@ __translate_appl_type(const char *typestr)
 
     return TYPE_UNKNOWN;
 }
+#endif  /* NETSNMP_NO_WRITE_SUPPORT */
 
 static int
 __translate_asn_type(int asn_type)
@@ -609,6 +608,7 @@ __concat_oid_str(oid *doid_arr, int *doid_arr_len, char *soid_str)
    return(SUCCESS);
 }
 
+#ifndef NETSNMP_NO_WRITE_SUPPORT
 /*
  * add a varbind to PDU
  */
@@ -734,6 +734,7 @@ __add_var_val_str(netsnmp_pdu *pdu, oid *name, int name_length, char *val,
 
      return ret;
 }
+#endif  /* NETSNMP_NO_WRITE_SUPPORT */
 
 /* takes ss and pdu as input and updates the 'response' argument */
 /* the input 'pdu' argument will be freed */
@@ -2325,10 +2326,11 @@ netsnmp_getbulk(PyObject *self, PyObject *args)
 static PyObject *
 netsnmp_set(PyObject *self, PyObject *args)
 {
+  PyObject *ret = NULL;
+#ifndef NETSNMP_NO_WRITE_SUPPORT
   PyObject *session;
   PyObject *varlist;
   PyObject *varbind;
-  PyObject *ret = NULL;
   netsnmp_session *ss;
   netsnmp_pdu *pdu, *response;
   struct tree *tp;
@@ -2461,6 +2463,7 @@ netsnmp_set(PyObject *self, PyObject *args)
  done:
   Py_XDECREF(varbind);
   free(oid_arr);
+#endif  /* NETSNMP_NO_WRITE_SUPPORT */
   return (ret ? ret : Py_BuildValue(""));
 }