[Pkg-net-snmp-commits] [pkg-net-snmp] 02/03: fix bug#721224

[Hideki Yamane]

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch wheezy
in repository pkg-net-snmp.

commit b85b4edad74ae975885c87dafeb9a72cf1f0ab30
Author: Hideki Yamane <henrich at debian.org>
Date:   Sun May 4 09:04:47 2014 +0900

    fix bug#721224
---
 debian/changelog                               | 12 +++++++++++
 debian/patches/bug#721224_entries_over50.patch | 29 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5eb4c2e..a929af5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+net-snmp (5.4.3~dfsg-2.8+deb7u1) stable-proposed-updates; urgency=medium
+
+  * Team upload.
+  * debian/patches
+    - add bug#721224_entries_over50.patch to fix "snmpd: produces error if the
+      Executables/scripts entries in snmpd.conf is over 50" taken patch from
+      Red Hat Bugzilla.
+      Thanks to "Christian Ruppert" <c.ruppert at babiel.com> for the report
+      (Closes: #721224) 
+
+ -- Hideki Yamane <henrich at debian.org>  Sun, 04 May 2014 08:59:03 +0900
+
 net-snmp (5.4.3~dfsg-2.8) stable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/patches/bug#721224_entries_over50.patch b/debian/patches/bug#721224_entries_over50.patch
new file mode 100644
index 0000000..633242c
--- /dev/null
+++ b/debian/patches/bug#721224_entries_over50.patch
@@ -0,0 +1,29 @@
+Index: net-snmp/agent/mibgroup/agent/extend.c
+===================================================================
+--- net-snmp.orig/agent/mibgroup/agent/extend.c	2014-05-04 07:53:51.731755326 +0900
++++ net-snmp/agent/mibgroup/agent/extend.c	2014-05-04 07:54:28.075895631 +0900
+@@ -476,10 +476,21 @@
+             
+     } else if (!strcmp( token, "sh"   ) ||
+                !strcmp( token, "exec" )) {
+-        if ( num_compatability_entries == max_compatability_entries )
++        if ( num_compatability_entries == max_compatability_entries ) {
+             /* XXX - should really use dynamic allocation */
+-            config_perror("No further UCD-compatible entries" );
+-        else
++            netsnmp_old_extend *new_compatability_entries;
++            new_compatability_entries = realloc(compatability_entries,
++                             max_compatability_entries*2*sizeof(netsnmp_old_extend));
++            if (!new_compatability_entries)
++                config_perror("No further UCD-compatible entries" );
++            else {
++                memset(new_compatability_entries+num_compatability_entries, 0,
++                        sizeof(netsnmp_old_extend)*max_compatability_entries);
++                max_compatability_entries *= 2;
++                compatability_entries = new_compatability_entries;
++            }
++        }
++        if (num_compatability_entries != max_compatability_entries)
+             compatability_entries[
+                 num_compatability_entries++ ].exec_entry = extension;
+     }
diff --git a/debian/patches/series b/debian/patches/series
index d9b232c..08dd835 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+bug#721224_entries_over50.patch
 02_statistics.patch
 03_makefiles.patch
 05_searchdirs.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-net-snmp/pkg-net-snmp.git