[tw] - fixed sig patch (#141110). Thanks to Nikita Shulga for the patch

This commit is contained in:
Thomas Woerner 2005-05-06 13:29:14 +00:00
parent 206ad5896f
commit 26ad4bc237
2 changed files with 26 additions and 1 deletions

View File

@ -0,0 +1,20 @@
--- tcp_wrappers_7.6/hosts_access.c.bug141110 2004-11-29 15:19:09.872243504 +0300
+++ tcp_wrappers_7.6/hosts_access.c 2004-11-29 19:59:09.282344976 +0300
@@ -127,7 +127,7 @@
verdict = setjmp(tcpd_buf);
if (verdict != 0)
return (verdict == AC_PERMIT);
- if (table_match(hosts_allow_table, request))
+ if (table_match(hosts_allow_table, request) == YES)
return (YES);
if (table_match(hosts_deny_table, request) == NO)
return (YES);
@@ -177,7 +177,7 @@
tcpd_warn("cannot open %s: %m", table);
match = ERR;
}
- if (match) {
+ if (match == YES) {
if (hosts_access_verbose > 1)
syslog(LOG_DEBUG, "matched: %s line %d",
tcpd_context.file, tcpd_context.line);

View File

@ -1,7 +1,7 @@
Summary: A security tool which acts as a wrapper for TCP daemons.
Name: tcp_wrappers
Version: 7.6
Release: 38
Release: 39
%define LIB_MAJOR 0
%define LIB_MINOR 7
@ -25,6 +25,7 @@ Patch11: tcp_wrappers-7.6-shared.patch
Patch12: tcp_wrappers-7.6-sig.patch
Patch13: tcp_wrappers-7.6-strerror.patch
Patch14: tcp_wrappers-7.6-ldflags.patch
Patch15: tcp_wrappers-7.6-fix_sig-bug141110.patch
# required by sin_scope_id in ipv6 patch
BuildPreReq: glibc-devel >= 2.2
BuildRoot: %{_tmppath}/%{name}-root
@ -55,6 +56,7 @@ This version also supports IPv6.
%patch12 -p1 -b .sig
%patch13 -p1 -b .strerror
%patch14 -p1 -b .cflags
%patch15 -p1 -b .fix_sig
%build
make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -DPIC -D_REENTRANT -DHAVE_STRERROR" LDFLAGS="-pie" MAJOR=%{LIB_MAJOR} MINOR=%{LIB_MINOR} REL=%{LIB_REL} linux
@ -102,6 +104,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_sbindir}/*
%changelog
* Fri May 6 2005 Thomas Woerner <twoerner@redhat.com> 7.6-39
- fixed sig patch (#141110). Thanks to Nikita Shulga for the patch
* Wed Feb 9 2005 Thomas Woerner <twoerner@redhat.com> 7.6-38
- rebuild