Fix wrong systemd patch (#1545946)

This commit is contained in:
Josef Ridky 2018-02-16 07:35:56 +01:00
parent 4309199ccc
commit 08064860dd
2 changed files with 6 additions and 3 deletions

View File

@ -82,10 +82,10 @@ diff -up net-snmp-5.7.3/agent/snmpd.c.MPGqYh net-snmp-5.7.3/agent/snmpd.c
#endif #endif
#ifndef WIN32 #ifndef WIN32
+#ifndef NETSNMP_NO_SYSYSTEMD +#ifndef NETSNMP_NO_SYSTEMD
+ /* check if systemd has sockets for us and don't close them */ + /* check if systemd has sockets for us and don't close them */
+ prepared_sockets = netsnmp_sd_listen_fds(0); + prepared_sockets = netsnmp_sd_listen_fds(0);
+#endif /* NETSNMP_NO_SYSYSTEMD */ +#endif /* NETSNMP_NO_SYSTEMD */
+ +
/* /*
* close all non-standard file descriptors we may have * close all non-standard file descriptors we may have

View File

@ -9,7 +9,7 @@
Summary: A collection of SNMP protocol tools and libraries Summary: A collection of SNMP protocol tools and libraries
Name: net-snmp Name: net-snmp
Version: 5.7.3 Version: 5.7.3
Release: 33%{?dist} Release: 34%{?dist}
Epoch: 1 Epoch: 1
License: BSD License: BSD
@ -491,6 +491,9 @@ LD_LIBRARY_PATH=%{buildroot}/%{_libdir} make test
%{_libdir}/libnetsnmptrapd*.so.* %{_libdir}/libnetsnmptrapd*.so.*
%changelog %changelog
* Fri Feb 16 2018 Josef Ridky <jridky@redhat.com> - 1:5.7.3-34
- fix wrong systemd patch (#1545946)
* Thu Feb 08 2018 Josef Ridky <jridky@redhat.com> - 1:5.7.3-33 * Thu Feb 08 2018 Josef Ridky <jridky@redhat.com> - 1:5.7.3-33
- Fix strstr() crash when looking for RPM Group tag - Fix strstr() crash when looking for RPM Group tag
- Fix wrong usage of structure iterator - Fix wrong usage of structure iterator