From f764e2312c8e4ec06890873176e45d295fcba48a Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Tue, 4 Jan 2011 13:53:54 +0100 Subject: [PATCH] updated to net-snmp-5.6.1 --- .gitignore | 1 + net-snmp-5.6-big-end-oid.patch | 89 ---------------------------------- sources | 2 +- 3 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 net-snmp-5.6-big-end-oid.patch diff --git a/.gitignore b/.gitignore index 44ede82..d221326 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ net-snmp-5.5.tar.gz /net-snmp-5.6.tar.gz +/net-snmp-5.6.1.tar.gz diff --git a/net-snmp-5.6-big-end-oid.patch b/net-snmp-5.6-big-end-oid.patch deleted file mode 100644 index f192a37..0000000 --- a/net-snmp-5.6-big-end-oid.patch +++ /dev/null @@ -1,89 +0,0 @@ -Bug 655731 - T065agentextend_simple fails on s390x and ppc64 - -commit c908aedcd9b05c031acc4807af03a42ded0f1af2 -Author: bvassche -Date: Sun Oct 17 16:57:38 2010 +0000 - - CHANGES: agent: table_helper_handler(), 64-bit architectures: avoid passing a pointer to a 32-bit value to a function that expects a pointer to a 64-bit value (parse_one_oid_index()). Not sure what the implications of this bug were. It might have caused very strange table behavior on 64-bit big endian systems. - Found this via Valgrind. - - - git-svn-id: https://net-snmp.svn.sourceforge.net/svnroot/net-snmp/trunk@19485 06827809-a52a-0410-b366-d66718629ded - -diff --git a/net-snmp/agent/helpers/table.c b/net-snmp/agent/helpers/table.c -index c20c673..e82f872 100644 ---- a/net-snmp/agent/helpers/table.c -+++ b/net-snmp/agent/helpers/table.c -@@ -172,7 +172,7 @@ table_helper_handler(netsnmp_mib_handler *handler, - int oid_index_pos; - unsigned int oid_column_pos; - unsigned int tmp_idx; -- int tmp_len; -+ ssize_t tmp_len; - int incomplete, out_of_range; - int status = SNMP_ERR_NOERROR, need_processing = 0; - oid *tmp_name; -@@ -314,11 +314,11 @@ table_helper_handler(netsnmp_mib_handler *handler, - * length) - */ - if (reginfo->rootoid_len > var->name_length) -- tmp_len = (int)var->name_length; -+ tmp_len = var->name_length; - else -- tmp_len = (int)reginfo->rootoid_len; -+ tmp_len = reginfo->rootoid_len; - if (snmp_oid_compare(reginfo->rootoid, reginfo->rootoid_len, -- var->name, (size_t)tmp_len) > 0) { -+ var->name, tmp_len) > 0) { - if (reqinfo->mode == MODE_GETNEXT) { - if (var->name != var->name_loc) - SNMP_FREE(var->name); -@@ -519,7 +519,7 @@ table_helper_handler(netsnmp_mib_handler *handler, - incomplete = 1; - tmp_len = -1; - } else -- tmp_len = (int)tbl_req_info->index_oid_len; -+ tmp_len = tbl_req_info->index_oid_len; - - - /* -@@ -530,6 +530,8 @@ table_helper_handler(netsnmp_mib_handler *handler, - for (tmp_idx = 0, vb = tbl_req_info->indexes; - tmp_idx < tbl_info->number_indexes; - ++tmp_idx, vb = vb->next_variable) { -+ size_t parsed_oid_len; -+ - if (incomplete && tmp_len) { - /* - * incomplete/illegal OID, set up dummy 0 to parse -@@ -545,23 +547,26 @@ table_helper_handler(netsnmp_mib_handler *handler, - * Reject requests of the form 'myObject' (no instance) - */ - tmp_len = 0; -- tmp_name = (oid *) & tmp_len; -+ tmp_name = NULL; - break; - } - /* - * try and parse current index - */ -- if (parse_one_oid_index(&tmp_name, (size_t*)&tmp_len, -+ netsnmp_assert(tmp_len >= 0); -+ parsed_oid_len = tmp_len; -+ if (parse_one_oid_index(&tmp_name, &parsed_oid_len, - vb, 1) != SNMPERR_SUCCESS) { - incomplete = 1; - tmp_len = -1; /* is this necessary? Better safe than - * sorry */ - } else { -+ tmp_len = parsed_oid_len; -+ DEBUGMSGTL(("helper:table", " got 1 (incomplete=%d)\n", -+ incomplete)); - /* - * do not count incomplete indexes - */ -- DEBUGMSGTL(("helper:table", " got 1 (incomplete=%d)\n", -- incomplete)); - if (incomplete) - continue; - ++tbl_req_info->number_indexes; /** got one ok */ diff --git a/sources b/sources index 81c5c33..f06411b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -89b3a7a77e68daef925abee43a3f7018 net-snmp-5.6.tar.gz +b4e30ead5783b0bb1d280172c6095ea4 net-snmp-5.6.1.tar.gz