Christian Wiese
14 years ago
30 changed files with 3547 additions and 206 deletions
@ -0,0 +1,91 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0001-tcp_wrappers-7.6-man-quoting.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5
|
||||
--- tcp_wrappers_7.6.orig/hosts_access.5 1995-01-30 19:51:47.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/hosts_access.5 2004-04-09 16:59:45.000000000 +0200
|
||||
@@ -173,7 +173,7 @@
|
||||
Patterns like these can be used when the machine has different internet
|
||||
addresses with different internet hostnames. Service providers can use
|
||||
this facility to offer FTP, GOPHER or WWW archives with internet names
|
||||
-that may even belong to different organizations. See also the `twist'
|
||||
+that may even belong to different organizations. See also the `twist\'
|
||||
option in the hosts_options(5) document. Some systems (Solaris,
|
||||
FreeBSD) can have more than one internet address on one physical
|
||||
interface; with other systems you may have to resort to SLIP or PPP
|
||||
@@ -236,10 +236,10 @@
|
||||
Before accepting a client request, the wrappers can use the IDENT
|
||||
service to find out that the client did not send the request at all.
|
||||
When the client host provides IDENT service, a negative IDENT lookup
|
||||
-result (the client matches `UNKNOWN@host') is strong evidence of a host
|
||||
+result (the client matches `UNKNOWN@host\') is strong evidence of a host
|
||||
spoofing attack.
|
||||
.PP
|
||||
-A positive IDENT lookup result (the client matches `KNOWN@host') is
|
||||
+A positive IDENT lookup result (the client matches `KNOWN@host\') is
|
||||
less trustworthy. It is possible for an intruder to spoof both the
|
||||
client connection and the IDENT lookup, although doing so is much
|
||||
harder than spoofing just a client connection. It may also be that
|
||||
diff -ruN tcp_wrappers_7.6.orig/hosts_options.5 tcp_wrappers_7.6/hosts_options.5
|
||||
--- tcp_wrappers_7.6.orig/hosts_options.5 1994-12-28 17:42:29.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/hosts_options.5 2004-04-09 16:59:49.000000000 +0200
|
||||
@@ -124,7 +124,7 @@
|
||||
value is taken.
|
||||
.SH MISCELLANEOUS
|
||||
.IP "banners /some/directory"
|
||||
-Look for a file in `/some/directory' with the same name as the daemon
|
||||
+Look for a file in `/some/directory\' with the same name as the daemon
|
||||
process (for example in.telnetd for the telnet service), and copy its
|
||||
contents to the client. Newline characters are replaced by
|
||||
carriage-return newline, and %<letter> sequences are expanded (see
|
||||
diff -ruN tcp_wrappers_7.6.orig/tcpdmatch.8 tcp_wrappers_7.6/tcpdmatch.8
|
||||
--- tcp_wrappers_7.6.orig/tcpdmatch.8 1996-02-11 17:01:36.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/tcpdmatch.8 2004-04-09 17:00:49.000000000 +0200
|
||||
@@ -26,7 +26,7 @@
|
||||
A daemon process name. Typically, the last component of a daemon
|
||||
executable pathname.
|
||||
.IP client
|
||||
-A host name or network address, or one of the `unknown' or `paranoid'
|
||||
+A host name or network address, or one of the `unknown\' or `paranoid\'
|
||||
wildcard patterns.
|
||||
.sp
|
||||
When a client host name is specified, \fItcpdmatch\fR gives a
|
||||
@@ -37,13 +37,13 @@
|
||||
.PP
|
||||
Optional information specified with the \fIdaemon@server\fR form:
|
||||
.IP server
|
||||
-A host name or network address, or one of the `unknown' or `paranoid'
|
||||
-wildcard patterns. The default server name is `unknown'.
|
||||
+A host name or network address, or one of the `unknown\' or `paranoid\'
|
||||
+wildcard patterns. The default server name is `unknown\'.
|
||||
.PP
|
||||
Optional information specified with the \fIuser@client\fR form:
|
||||
.IP user
|
||||
A client user identifier. Typically, a login name or a numeric userid.
|
||||
-The default user name is `unknown'.
|
||||
+The default user name is `unknown\'.
|
||||
.SH OPTIONS
|
||||
.IP -d
|
||||
Examine \fIhosts.allow\fR and \fIhosts.deny\fR files in the current
|
||||
@@ -70,7 +70,7 @@
|
||||
.ti +5
|
||||
tcpdmatch in.telnetd paranoid
|
||||
.PP
|
||||
-On some systems, daemon names have no `in.' prefix, or \fItcpdmatch\fR
|
||||
+On some systems, daemon names have no `in.\' prefix, or \fItcpdmatch\fR
|
||||
may need some help to locate the inetd configuration file.
|
||||
.SH FILES
|
||||
.PP
|
||||
@ -0,0 +1,52 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0002-tcp_wrappers-7.6-man-typos.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
diff -ruNp tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5
|
||||
--- tcp_wrappers_7.6.orig/hosts_access.5 2007-07-29 19:46:22.000000000 +0200
|
||||
+++ tcp_wrappers_7.6/hosts_access.5 2007-07-29 19:46:16.000000000 +0200
|
||||
@@ -12,7 +12,7 @@ An extended version of the access contro
|
||||
\fIhosts_options\fR(5) document. The extensions are turned on at
|
||||
program build time by building with -DPROCESS_OPTIONS.
|
||||
.PP
|
||||
-In the following text, \fIdaemon\fR is the the process name of a
|
||||
+In the following text, \fIdaemon\fR is the process name of a
|
||||
network daemon process, and \fIclient\fR is the name and/or address of
|
||||
a host requesting service. Network daemon process names are specified
|
||||
in the inetd configuration file.
|
||||
diff -ruNp tcp_wrappers_7.6.orig/tcpdchk.8 tcp_wrappers_7.6/tcpdchk.8
|
||||
--- tcp_wrappers_7.6.orig/tcpdchk.8 1995-01-08 17:00:31.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/tcpdchk.8 2007-07-29 19:46:01.000000000 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
.TH TCPDCHK 8
|
||||
.SH NAME
|
||||
tcpdchk \- tcp wrapper configuration checker
|
||||
-.SH SYNOPSYS
|
||||
+.SH SYNOPSIS
|
||||
tcpdchk [-a] [-d] [-i inet_conf] [-v]
|
||||
.SH DESCRIPTION
|
||||
.PP
|
||||
diff -ruNp tcp_wrappers_7.6.orig/tcpdmatch.8 tcp_wrappers_7.6/tcpdmatch.8
|
||||
--- tcp_wrappers_7.6.orig/tcpdmatch.8 2007-07-29 19:46:22.000000000 +0200
|
||||
+++ tcp_wrappers_7.6/tcpdmatch.8 2007-07-29 19:46:01.000000000 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
.TH TCPDMATCH 8
|
||||
.SH NAME
|
||||
tcpdmatch \- tcp wrapper oracle
|
||||
-.SH SYNOPSYS
|
||||
+.SH SYNOPSIS
|
||||
tcpdmatch [-d] [-i inet_conf] daemon client
|
||||
.sp
|
||||
tcpdmatch [-d] [-i inet_conf] daemon[@server] [user@]client
|
||||
@ -0,0 +1,264 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0003-tcp_wrappers-7.6-man-portability.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
diff -ruNp tcp_wrappers_7.6.orig/hosts_access.3 tcp_wrappers_7.6/hosts_access.3
|
||||
--- tcp_wrappers_7.6.orig/hosts_access.3 2005-03-09 18:30:25.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/hosts_access.3 2005-03-09 18:27:03.000000000 +0100
|
||||
@@ -3,7 +3,7 @@
|
||||
hosts_access, hosts_ctl, request_init, request_set \- access control library
|
||||
.SH SYNOPSIS
|
||||
.nf
|
||||
-#include "tcpd.h"
|
||||
+#include <tcpd.h>
|
||||
|
||||
extern int allow_severity;
|
||||
extern int deny_severity;
|
||||
diff -ruNp tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5
|
||||
--- tcp_wrappers_7.6.orig/hosts_access.5 2005-03-09 18:30:25.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/hosts_access.5 2005-03-09 18:30:18.000000000 +0100
|
||||
@@ -8,9 +8,9 @@ name, host name/address) patterns. Exam
|
||||
impatient reader is encouraged to skip to the EXAMPLES section for a
|
||||
quick introduction.
|
||||
.PP
|
||||
-An extended version of the access control language is described in the
|
||||
-\fIhosts_options\fR(5) document. The extensions are turned on at
|
||||
-program build time by building with -DPROCESS_OPTIONS.
|
||||
+The extended version of the access control language is described in the
|
||||
+\fIhosts_options\fR(5) document. \fBNote that this language supersedes
|
||||
+the meaning of \fIshell_command\fB as documented below.\fR
|
||||
.PP
|
||||
In the following text, \fIdaemon\fR is the process name of a
|
||||
network daemon process, and \fIclient\fR is the name and/or address of
|
||||
@@ -346,8 +346,8 @@ in.tftpd: LOCAL, .my.domain
|
||||
/etc/hosts.deny:
|
||||
.in +3
|
||||
.nf
|
||||
-in.tftpd: ALL: (/some/where/safe_finger -l @%h | \\
|
||||
- /usr/ucb/mail -s %d-%h root) &
|
||||
+in.tftpd: ALL: (/usr/sbin/safe_finger -l @%h | \\
|
||||
+ /usr/bin/mail -s %d-%h root) &
|
||||
.fi
|
||||
.PP
|
||||
The safe_finger command comes with the tcpd wrapper and should be
|
||||
@@ -383,6 +383,7 @@ that shouldn\'t. All problems are repor
|
||||
.fi
|
||||
.SH SEE ALSO
|
||||
.nf
|
||||
+hosts_options(5) extended syntax.
|
||||
tcpd(8) tcp/ip daemon wrapper program.
|
||||
tcpdchk(8), tcpdmatch(8), test programs.
|
||||
.SH BUGS
|
||||
diff -ruNp tcp_wrappers_7.6.orig/hosts_options.5 tcp_wrappers_7.6/hosts_options.5
|
||||
--- tcp_wrappers_7.6.orig/hosts_options.5 2005-03-09 18:30:24.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/hosts_options.5 2005-03-09 18:27:03.000000000 +0100
|
||||
@@ -2,10 +2,8 @@
|
||||
.SH NAME
|
||||
hosts_options \- host access control language extensions
|
||||
.SH DESCRIPTION
|
||||
-This document describes optional extensions to the language described
|
||||
-in the hosts_access(5) document. The extensions are enabled at program
|
||||
-build time. For example, by editing the Makefile and turning on the
|
||||
-PROCESS_OPTIONS compile-time option.
|
||||
+This document describes extensions to the language described
|
||||
+in the hosts_access(5) document.
|
||||
.PP
|
||||
The extensible language uses the following format:
|
||||
.sp
|
||||
@@ -58,12 +56,12 @@ Notice the leading dot on the domain nam
|
||||
Execute, in a child process, the specified shell command, after
|
||||
performing the %<letter> expansions described in the hosts_access(5)
|
||||
manual page. The command is executed with stdin, stdout and stderr
|
||||
-connected to the null device, so that it won\'t mess up the
|
||||
+connected to the null device, so that it won't mess up the
|
||||
conversation with the client host. Example:
|
||||
.sp
|
||||
.nf
|
||||
.ti +3
|
||||
-spawn (/some/where/safe_finger -l @%h | /usr/ucb/mail root) &
|
||||
+spawn (/usr/sbin/safe_finger -l @%h | /usr/bin/mail root) &
|
||||
.fi
|
||||
.sp
|
||||
executes, in a background child process, the shell command "safe_finger
|
||||
diff -ruNp tcp_wrappers_7.6.orig/inetcf.c tcp_wrappers_7.6/inetcf.c
|
||||
--- tcp_wrappers_7.6.orig/inetcf.c 1997-02-12 02:13:24.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/inetcf.c 2005-03-09 18:27:03.000000000 +0100
|
||||
@@ -26,13 +26,17 @@ extern void exit();
|
||||
* guesses. Shorter names follow longer ones.
|
||||
*/
|
||||
char *inet_files[] = {
|
||||
+#if 0
|
||||
"/private/etc/inetd.conf", /* NEXT */
|
||||
"/etc/inet/inetd.conf", /* SYSV4 */
|
||||
"/usr/etc/inetd.conf", /* IRIX?? */
|
||||
+#endif
|
||||
"/etc/inetd.conf", /* BSD */
|
||||
+#if 0
|
||||
"/etc/net/tlid.conf", /* SYSV4?? */
|
||||
"/etc/saf/tlid.conf", /* SYSV4?? */
|
||||
"/etc/tlid.conf", /* SYSV4?? */
|
||||
+#endif
|
||||
0,
|
||||
};
|
||||
|
||||
diff -ruNp tcp_wrappers_7.6.orig/tcpd.8 tcp_wrappers_7.6/tcpd.8
|
||||
--- tcp_wrappers_7.6.orig/tcpd.8 1996-02-21 16:39:16.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/tcpd.8 2005-03-09 18:27:03.000000000 +0100
|
||||
@@ -12,7 +12,11 @@ The program supports both 4.3BSD-style s
|
||||
TLI. Functionality may be limited when the protocol underneath TLI is
|
||||
not an internet protocol.
|
||||
.PP
|
||||
-Operation is as follows: whenever a request for service arrives, the
|
||||
+There are two possible modes of operation: execution of \fItcpd\fP
|
||||
+before a service started by \fIinetd\fP, or linking a daemon with
|
||||
+the \fIlibwrap\fP shared library as documented in the \fIhosts_access\fR(3)
|
||||
+manual page. Operation when started by \fIinetd\fP
|
||||
+is as follows: whenever a request for service arrives, the
|
||||
\fIinetd\fP daemon is tricked into running the \fItcpd\fP program
|
||||
instead of the desired server. \fItcpd\fP logs the request and does
|
||||
some additional checks. When all is well, \fItcpd\fP runs the
|
||||
@@ -88,11 +92,11 @@ configuration files.
|
||||
.sp
|
||||
.in +5
|
||||
# mkdir /other/place
|
||||
-# mv /usr/etc/in.fingerd /other/place
|
||||
-# cp tcpd /usr/etc/in.fingerd
|
||||
+# mv /usr/sbin/in.fingerd /other/place
|
||||
+# cp tcpd /usr/sbin/in.fingerd
|
||||
.fi
|
||||
.PP
|
||||
-The example assumes that the network daemons live in /usr/etc. On some
|
||||
+The example assumes that the network daemons live in /usr/sbin. On some
|
||||
systems, network daemons live in /usr/sbin or in /usr/libexec, or have
|
||||
no `in.\' prefix to their name.
|
||||
.SH EXAMPLE 2
|
||||
@@ -101,35 +105,34 @@ are left in their original place.
|
||||
.PP
|
||||
In order to monitor access to the \fIfinger\fR service, perform the
|
||||
following edits on the \fIinetd\fR configuration file (usually
|
||||
-\fI/etc/inetd.conf\fR or \fI/etc/inet/inetd.conf\fR):
|
||||
+\fI/etc/inetd.conf\fR):
|
||||
.nf
|
||||
.sp
|
||||
.ti +5
|
||||
-finger stream tcp nowait nobody /usr/etc/in.fingerd in.fingerd
|
||||
+finger stream tcp nowait nobody /usr/sbin/in.fingerd in.fingerd
|
||||
.sp
|
||||
becomes:
|
||||
.sp
|
||||
.ti +5
|
||||
-finger stream tcp nowait nobody /some/where/tcpd in.fingerd
|
||||
+finger stream tcp nowait nobody /usr/sbin/tcpd in.fingerd
|
||||
.sp
|
||||
.fi
|
||||
.PP
|
||||
-The example assumes that the network daemons live in /usr/etc. On some
|
||||
+The example assumes that the network daemons live in /usr/sbin. On some
|
||||
systems, network daemons live in /usr/sbin or in /usr/libexec, the
|
||||
daemons have no `in.\' prefix to their name, or there is no userid
|
||||
field in the inetd configuration file.
|
||||
.PP
|
||||
Similar changes will be needed for the other services that are to be
|
||||
covered by \fItcpd\fR. Send a `kill -HUP\' to the \fIinetd\fR(8)
|
||||
-process to make the changes effective. AIX users may also have to
|
||||
-execute the `inetimp\' command.
|
||||
+process to make the changes effective.
|
||||
.SH EXAMPLE 3
|
||||
In the case of daemons that do not live in a common directory ("secret"
|
||||
or otherwise), edit the \fIinetd\fR configuration file so that it
|
||||
specifies an absolute path name for the process name field. For example:
|
||||
.nf
|
||||
.sp
|
||||
- ntalk dgram udp wait root /some/where/tcpd /usr/local/lib/ntalkd
|
||||
+ ntalk dgram udp wait root /usr/sbin/tcpd /usr/local/lib/ntalkd
|
||||
.sp
|
||||
.fi
|
||||
.PP
|
||||
@@ -164,6 +167,7 @@ The default locations of the host access
|
||||
.SH SEE ALSO
|
||||
.na
|
||||
.nf
|
||||
+hosts_access(3), functions provided by the libwrap library.
|
||||
hosts_access(5), format of the tcpd access control tables.
|
||||
syslog.conf(5), format of the syslogd control file.
|
||||
inetd.conf(5), format of the inetd control file.
|
||||
diff -ruNp tcp_wrappers_7.6.orig/tcpdchk.8 tcp_wrappers_7.6/tcpdchk.8
|
||||
--- tcp_wrappers_7.6.orig/tcpdchk.8 1995-01-08 17:00:31.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/tcpdchk.8 2005-03-09 18:27:03.000000000 +0100
|
||||
@@ -9,8 +9,8 @@ tcpdchk [-a] [-d] [-i inet_conf] [-v]
|
||||
potential and real problems it can find. The program examines the
|
||||
\fItcpd\fR access control files (by default, these are
|
||||
\fI/etc/hosts.allow\fR and \fI/etc/hosts.deny\fR), and compares the
|
||||
-entries in these files against entries in the \fIinetd\fR or \fItlid\fR
|
||||
-network configuration files.
|
||||
+entries in these files against entries in the \fIinetd\fR
|
||||
+network configuration file.
|
||||
.PP
|
||||
\fItcpdchk\fR reports problems such as non-existent pathnames; services
|
||||
that appear in \fItcpd\fR access control rules, but are not controlled
|
||||
@@ -26,14 +26,13 @@ problem.
|
||||
.SH OPTIONS
|
||||
.IP -a
|
||||
Report access control rules that permit access without an explicit
|
||||
-ALLOW keyword. This applies only when the extended access control
|
||||
-language is enabled (build with -DPROCESS_OPTIONS).
|
||||
+ALLOW keyword.
|
||||
.IP -d
|
||||
Examine \fIhosts.allow\fR and \fIhosts.deny\fR files in the current
|
||||
directory instead of the default ones.
|
||||
.IP "-i inet_conf"
|
||||
Specify this option when \fItcpdchk\fR is unable to find your
|
||||
-\fIinetd.conf\fR or \fItlid.conf\fR network configuration file, or when
|
||||
+\fIinetd.conf\fR network configuration file, or when
|
||||
you suspect that the program uses the wrong one.
|
||||
.IP -v
|
||||
Display the contents of each access control rule. Daemon lists, client
|
||||
@@ -54,7 +53,6 @@ tcpdmatch(8), explain what tcpd would do
|
||||
hosts_access(5), format of the tcpd access control tables.
|
||||
hosts_options(5), format of the language extensions.
|
||||
inetd.conf(5), format of the inetd control file.
|
||||
-tlid.conf(5), format of the tlid control file.
|
||||
.SH AUTHORS
|
||||
.na
|
||||
.nf
|
||||
diff -ruNp tcp_wrappers_7.6.orig/tcpdmatch.8 tcp_wrappers_7.6/tcpdmatch.8
|
||||
--- tcp_wrappers_7.6.orig/tcpdmatch.8 2005-03-09 18:30:24.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/tcpdmatch.8 2005-03-09 18:27:03.000000000 +0100
|
||||
@@ -13,7 +13,7 @@ request for service. Examples are given
|
||||
The program examines the \fItcpd\fR access control tables (default
|
||||
\fI/etc/hosts.allow\fR and \fI/etc/hosts.deny\fR) and prints its
|
||||
conclusion. For maximal accuracy, it extracts additional information
|
||||
-from your \fIinetd\fR or \fItlid\fR network configuration file.
|
||||
+from your \fIinetd\fR network configuration file.
|
||||
.PP
|
||||
When \fItcpdmatch\fR finds a match in the access control tables, it
|
||||
identifies the matched rule. In addition, it displays the optional
|
||||
@@ -50,7 +50,7 @@ Examine \fIhosts.allow\fR and \fIhosts.d
|
||||
directory instead of the default ones.
|
||||
.IP "-i inet_conf"
|
||||
Specify this option when \fItcpdmatch\fR is unable to find your
|
||||
-\fIinetd.conf\fR or \fItlid.conf\fR network configuration file, or when
|
||||
+\fIinetd.conf\fR network configuration file, or when
|
||||
you suspect that the program uses the wrong one.
|
||||
.SH EXAMPLES
|
||||
To predict how \fItcpd\fR would handle a telnet request from the local
|
||||
@@ -86,7 +86,6 @@ tcpdchk(8), tcpd configuration checker
|
||||
hosts_access(5), format of the tcpd access control tables.
|
||||
hosts_options(5), format of the language extensions.
|
||||
inetd.conf(5), format of the inetd control file.
|
||||
-tlid.conf(5), format of the tlid control file.
|
||||
.SH AUTHORS
|
||||
.na
|
||||
.nf
|
||||
@ -0,0 +1,46 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0004-tcp_wrappers-7.6-fix-gethostbyname.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
* Mon Feb 5 2001 Preston Brown <pbrown@redhat.com>
|
||||
- fix gethostbyname to work better with dot "." notation (#16949)
|
||||
|
||||
--- tcp_wrappers_7.6/socket.c.fixgethostbyname Fri Mar 21 13:27:25 1997
|
||||
+++ tcp_wrappers_7.6/socket.c Mon Feb 5 14:09:40 2001
|
||||
@@ -52,7 +52,8 @@
|
||||
char *name;
|
||||
{
|
||||
char dot_name[MAXHOSTNAMELEN + 1];
|
||||
-
|
||||
+ struct hostent *hp;
|
||||
+
|
||||
/*
|
||||
* Don't append dots to unqualified names. Such names are likely to come
|
||||
* from local hosts files or from NIS.
|
||||
@@ -61,8 +62,12 @@
|
||||
if (strchr(name, '.') == 0 || strlen(name) >= MAXHOSTNAMELEN - 1) {
|
||||
return (gethostbyname(name));
|
||||
} else {
|
||||
- sprintf(dot_name, "%s.", name);
|
||||
- return (gethostbyname(dot_name));
|
||||
+ sprintf(dot_name, "%s.", name);
|
||||
+ hp = gethostbyname(dot_name);
|
||||
+ if (hp)
|
||||
+ return hp;
|
||||
+ else
|
||||
+ return (gethostbyname(name));
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,133 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0005-tcp_wrappers-7.6-wildcard-matching.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=17847
|
||||
(Though the original code needs to be patched to be case-insensitive.)
|
||||
|
||||
--- a/hosts_access.5
|
||||
+++ b/hosts_access.5
|
||||
@@ -89,6 +89,10 @@ An expression of the form `n.n.n.n/m.m.m
|
||||
bitwise AND of the address and the `mask\'. For example, the net/mask
|
||||
pattern `131.155.72.0/255.255.254.0\' matches every address in the
|
||||
range `131.155.72.0\' through `131.155.73.255\'.
|
||||
+.IP \(bu
|
||||
+Wildcards `*\' and `?\' can be used to match hostnames or IP addresses. This
|
||||
+method of matching cannot be used in conjunction with `net/mask\' matching,
|
||||
+hostname matching beginning with `.\' or IP address matching ending with `.\'.
|
||||
.SH WILDCARDS
|
||||
The access control language supports explicit wildcards:
|
||||
.IP ALL
|
||||
--- a/hosts_access.c
|
||||
+++ b/hosts_access.c
|
||||
@@ -82,6 +82,7 @@ static int client_match();
|
||||
static int host_match();
|
||||
static int string_match();
|
||||
static int masked_match();
|
||||
+static int match_pattern_ylo();
|
||||
|
||||
/* Size of logical line buffer. */
|
||||
|
||||
@@ -289,6 +290,11 @@ char *string;
|
||||
{
|
||||
int n;
|
||||
|
||||
+#ifndef DISABLE_WILDCARD_MATCHING
|
||||
+ if (strchr(tok, '*') || strchr(tok,'?')) { /* contains '*' or '?' */
|
||||
+ return (match_pattern_ylo(string,tok));
|
||||
+ } else
|
||||
+#endif
|
||||
if (tok[0] == '.') { /* suffix */
|
||||
n = strlen(string) - strlen(tok);
|
||||
return (n > 0 && STR_EQ(tok, string + n));
|
||||
@@ -329,3 +335,78 @@ char *string;
|
||||
}
|
||||
return ((addr & mask) == net);
|
||||
}
|
||||
+
|
||||
+#ifndef DISABLE_WILDCARD_MATCHING
|
||||
+/* Note: this feature has been adapted in a pretty straightforward way
|
||||
+ from Tatu Ylonen's last SSH version under free license by
|
||||
+ Pekka Savola <pekkas@netcore.fi>.
|
||||
+
|
||||
+ Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
||||
+*/
|
||||
+
|
||||
+/* Returns true if the given string matches the pattern (which may contain
|
||||
+ ? and * as wildcards), and zero if it does not match. */
|
||||
+
|
||||
+static int match_pattern_ylo(const char *s, const char *pattern)
|
||||
+{
|
||||
+ char src;
|
||||
+ char pat;
|
||||
+ while (1)
|
||||
+ {
|
||||
+ /* If at end of pattern, accept if also at end of string. */
|
||||
+ if (!*pattern)
|
||||
+ return !*s;
|
||||
+
|
||||
+ /* Process '*'. */
|
||||
+ if (*pattern == '*')
|
||||
+ {
|
||||
+ /* Skip the asterisk. */
|
||||
+ pattern++;
|
||||
+
|
||||
+ /* If at end of pattern, accept immediately. */
|
||||
+ if (!*pattern)
|
||||
+ return 1;
|
||||
+
|
||||
+ /* If next character in pattern is known, optimize. */
|
||||
+ if (*pattern != '?' && *pattern != '*')
|
||||
+ {
|
||||
+ /* Look instances of the next character in pattern, and try
|
||||
+ to match starting from those. */
|
||||
+ pat = *pattern;
|
||||
+ for (; *s; s++) {
|
||||
+ src = *s;
|
||||
+ if (toupper(src) == toupper(pat) &&
|
||||
+ match_pattern_ylo(s + 1, pattern + 1))
|
||||
+ return 1;
|
||||
+ }
|
||||
+ /* Failed. */
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ /* Move ahead one character at a time and try to match at each
|
||||
+ position. */
|
||||
+ for (; *s; s++)
|
||||
+ if (match_pattern_ylo(s, pattern))
|
||||
+ return 1;
|
||||
+ /* Failed. */
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ /* There must be at least one more character in the string. If we are
|
||||
+ at the end, fail. */
|
||||
+ if (!*s)
|
||||
+ return 0;
|
||||
+
|
||||
+ /* Check if the next character of the string is acceptable. */
|
||||
+ pat = *pattern;
|
||||
+ src = *s;
|
||||
+ if (*pattern != '?' && toupper(pat) != toupper(src))
|
||||
+ return 0;
|
||||
+
|
||||
+ /* Move to the next character, both in string and in pattern. */
|
||||
+ s++;
|
||||
+ pattern++;
|
||||
+ }
|
||||
+ /*NOTREACHED*/
|
||||
+}
|
||||
+#endif /* DISABLE_WILDCARD_MATCHING */
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,167 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0007-tcp_wrappers-7.6-tcpd-blacklist.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
Path: news.porcupine.org!news.porcupine.org!not-for-mail
|
||||
From: Wietse Venema <wietse@((no)(spam)(please))wzv.win.tue.nl>
|
||||
Newsgroups: comp.mail.sendmail,comp.security.unix
|
||||
Subject: TCP Wrapper Blacklist Extension
|
||||
Followup-To: poster
|
||||
Date: 8 Sep 1997 18:53:13 -0400
|
||||
Organization: Wietse's hangout while on sabattical in the USA
|
||||
Lines: 147
|
||||
Sender: wietse@spike.porcupine.org
|
||||
Message-ID: <5v1vkp$h4f$1@spike.porcupine.org>
|
||||
NNTP-Posting-Host: spike.porcupine.org
|
||||
Xref: news.porcupine.org comp.mail.sendmail:3541 comp.security.unix:7158
|
||||
|
||||
The patch below adds a new host pattern to the TCP Wrapper access
|
||||
control language. Instead of a host name or address pattern, you
|
||||
can specify an external /file/name with host name or address
|
||||
patterns. The feature can be used recursively.
|
||||
|
||||
The /file/name extension makes it easy to blacklist bad sites, for
|
||||
example, to block unwanted electronic mail when libwrap is linked
|
||||
into sendmail. Adding hosts to a simple text file is much easier
|
||||
than having to edit a more complex hosts.allow/deny file.
|
||||
|
||||
I developed this a year or so ago as a substitute for NIS netgroups.
|
||||
At that time, I did not consider it of sufficient interest for
|
||||
inclusion in the TCP Wrapper distribution. How times have changed.
|
||||
|
||||
The patch is relative to TCP Wrappers version 7.6. The main archive
|
||||
site is ftp://ftp.win.tue.nl/pub/security/tcp_wrappers_7.6.tar.gz
|
||||
|
||||
Thanks to the Debian LINUX folks for expressing their interest in
|
||||
this patch.
|
||||
|
||||
Wietse
|
||||
|
||||
|
||||
[diff updated by Md]
|
||||
|
||||
diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5
|
||||
--- tcp_wrappers_7.6.orig/hosts_access.5 2004-04-10 19:28:09.000000000 +0200
|
||||
+++ tcp_wrappers_7.6/hosts_access.5 2004-04-10 19:28:01.000000000 +0200
|
||||
@@ -97,6 +97,13 @@
|
||||
`[3ffe:505:2:1::]/64\' matches every address in the range
|
||||
`3ffe:505:2:1::\' through `3ffe:505:2:1:ffff:ffff:ffff:ffff\'.
|
||||
.IP \(bu
|
||||
+A string that begins with a `/\' character is treated as a file
|
||||
+name. A host name or address is matched if it matches any host name
|
||||
+or address pattern listed in the named file. The file format is
|
||||
+zero or more lines with zero or more host name or address patterns
|
||||
+separated by whitespace. A file name pattern can be used anywhere
|
||||
+a host name or address pattern can be used.
|
||||
+.IP \(bu
|
||||
Wildcards `*\' and `?\' can be used to match hostnames or IP addresses. This
|
||||
method of matching cannot be used in conjunction with `net/mask\' matching,
|
||||
hostname matching beginning with `.\' or IP address matching ending with `.\'.
|
||||
diff -ruN tcp_wrappers_7.6.orig/hosts_access.c tcp_wrappers_7.6/hosts_access.c
|
||||
--- tcp_wrappers_7.6.orig/hosts_access.c 2004-04-10 19:28:09.000000000 +0200
|
||||
+++ tcp_wrappers_7.6/hosts_access.c 2004-04-10 19:27:05.000000000 +0200
|
||||
@@ -253,6 +253,26 @@
|
||||
}
|
||||
}
|
||||
|
||||
+/* hostfile_match - look up host patterns from file */
|
||||
+
|
||||
+static int hostfile_match(path, host)
|
||||
+char *path;
|
||||
+struct hosts_info *host;
|
||||
+{
|
||||
+ char tok[BUFSIZ];
|
||||
+ int match = NO;
|
||||
+ FILE *fp;
|
||||
+
|
||||
+ if ((fp = fopen(path, "r")) != 0) {
|
||||
+ while (fscanf(fp, "%s", tok) == 1 && !(match = host_match(tok, host)))
|
||||
+ /* void */ ;
|
||||
+ fclose(fp);
|
||||
+ } else if (errno != ENOENT) {
|
||||
+ tcpd_warn("open %s: %m", path);
|
||||
+ }
|
||||
+ return (match);
|
||||
+}
|
||||
+
|
||||
/* host_match - match host name and/or address against pattern */
|
||||
|
||||
static int host_match(tok, host)
|
||||
@@ -280,6 +300,8 @@
|
||||
tcpd_warn("netgroup support is disabled"); /* not tcpd_jump() */
|
||||
return (NO);
|
||||
#endif
|
||||
+ } else if (tok[0] == '/') { /* /file hack */
|
||||
+ return (hostfile_match(tok, host));
|
||||
} else if (STR_EQ(tok, "KNOWN")) { /* check address and name */
|
||||
char *name = eval_hostname(host);
|
||||
return (STR_NE(eval_hostaddr(host), unknown) && HOSTNAME_KNOWN(name));
|
||||
diff -ruN tcp_wrappers_7.6.orig/tcpdchk.c tcp_wrappers_7.6/tcpdchk.c
|
||||
--- tcp_wrappers_7.6.orig/tcpdchk.c 2004-04-10 19:28:09.000000000 +0200
|
||||
+++ tcp_wrappers_7.6/tcpdchk.c 2004-04-10 19:27:05.000000000 +0200
|
||||
@@ -353,6 +353,8 @@
|
||||
{
|
||||
if (pat[0] == '@') {
|
||||
tcpd_warn("%s: daemon name begins with \"@\"", pat);
|
||||
+ } else if (pat[0] == '/') {
|
||||
+ tcpd_warn("%s: daemon name begins with \"/\"", pat);
|
||||
} else if (pat[0] == '.') {
|
||||
tcpd_warn("%s: daemon name begins with dot", pat);
|
||||
} else if (pat[strlen(pat) - 1] == '.') {
|
||||
@@ -385,6 +387,8 @@
|
||||
{
|
||||
if (pat[0] == '@') { /* @netgroup */
|
||||
tcpd_warn("%s: user name begins with \"@\"", pat);
|
||||
+ } else if (pat[0] == '/') {
|
||||
+ tcpd_warn("%s: user name begins with \"/\"", pat);
|
||||
} else if (pat[0] == '.') {
|
||||
tcpd_warn("%s: user name begins with dot", pat);
|
||||
} else if (pat[strlen(pat) - 1] == '.') {
|
||||
@@ -430,8 +434,13 @@
|
||||
static int check_host(pat)
|
||||
char *pat;
|
||||
{
|
||||
+ char buf[BUFSIZ];
|
||||
char *mask;
|
||||
int addr_count = 1;
|
||||
+ FILE *fp;
|
||||
+ struct tcpd_context saved_context;
|
||||
+ char *cp;
|
||||
+ char *wsp = " \t\r\n";
|
||||
|
||||
if (pat[0] == '@') { /* @netgroup */
|
||||
#ifdef NO_NETGRENT
|
||||
@@ -450,6 +459,21 @@
|
||||
tcpd_warn("netgroup support disabled");
|
||||
#endif
|
||||
#endif
|
||||
+ } else if (pat[0] == '/') { /* /path/name */
|
||||
+ if ((fp = fopen(pat, "r")) != 0) {
|
||||
+ saved_context = tcpd_context;
|
||||
+ tcpd_context.file = pat;
|
||||
+ tcpd_context.line = 0;
|
||||
+ while (fgets(buf, sizeof(buf), fp)) {
|
||||
+ tcpd_context.line++;
|
||||
+ for (cp = strtok(buf, wsp); cp; cp = strtok((char *) 0, wsp))
|
||||
+ check_host(cp);
|
||||
+ }
|
||||
+ tcpd_context = saved_context;
|
||||
+ fclose(fp);
|
||||
+ } else if (errno != ENOENT) {
|
||||
+ tcpd_warn("open %s: %m", pat);
|
||||
+ }
|
||||
} else if (mask = split_at(pat, '/')) { /* network/netmask */
|
||||
#ifdef INET6
|
||||
int mask_len;
|
||||
@ -0,0 +1,61 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0008-tcp_wrappers-7.6-usagi-fix.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
diff -uN tcp_wrappers_7.6/hosts_access.c tcp_wrappers_7.6.new/hosts_access.c
|
||||
--- tcp_wrappers_7.6/hosts_access.c Mon May 20 14:00:56 2002
|
||||
+++ tcp_wrappers_7.6.new/hosts_access.c Mon May 20 14:25:05 2002
|
||||
@@ -448,6 +448,15 @@
|
||||
int len, mask_len, i = 0;
|
||||
char ch;
|
||||
|
||||
+ /*
|
||||
+ * Behavior of getaddrinfo() against IPv4-mapped IPv6 address is
|
||||
+ * different between KAME and Solaris8. While KAME returns
|
||||
+ * AF_INET6, Solaris8 returns AF_INET. So, we avoid this here.
|
||||
+ */
|
||||
+ if (STRN_EQ(string, "::ffff:", 7)
|
||||
+ && dot_quad_addr(string + 7) != INADDR_NONE)
|
||||
+ return (masked_match4(net_tok, mask_tok, string + 7));
|
||||
+
|
||||
memset(&hints, 0, sizeof(hints));
|
||||
hints.ai_family = AF_INET6;
|
||||
hints.ai_socktype = SOCK_STREAM;
|
||||
@@ -457,13 +466,6 @@
|
||||
memcpy(&addr, res->ai_addr, sizeof(addr));
|
||||
freeaddrinfo(res);
|
||||
|
||||
- if (IN6_IS_ADDR_V4MAPPED(&addr.sin6_addr)) {
|
||||
- if ((*(u_int32_t *)&net.sin6_addr.s6_addr[12] = dot_quad_addr(net_tok)) == INADDR_NONE
|
||||
- || (mask = dot_quad_addr(mask_tok)) == INADDR_NONE)
|
||||
- return (NO);
|
||||
- return ((*(u_int32_t *)&addr.sin6_addr.s6_addr[12] & mask) == *(u_int32_t *)&net.sin6_addr.s6_addr[12]);
|
||||
- }
|
||||
-
|
||||
/* match IPv6 address against netnumber/prefixlen */
|
||||
len = strlen(net_tok);
|
||||
if (*net_tok != '[' || net_tok[len - 1] != ']')
|
||||
diff -uN tcp_wrappers_7.6/socket.c tcp_wrappers_7.6.new/socket.c
|
||||
--- tcp_wrappers_7.6/socket.c Mon May 20 13:48:35 2002
|
||||
+++ tcp_wrappers_7.6.new/socket.c Mon May 20 14:22:27 2002
|
||||
@@ -228,7 +228,7 @@
|
||||
hints.ai_family = sin->sa_family;
|
||||
hints.ai_socktype = SOCK_STREAM;
|
||||
hints.ai_flags = AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST;
|
||||
- if ((err = getaddrinfo(host->name, NULL, &hints, &res0) == 0)) {
|
||||
+ if ((err = getaddrinfo(host->name, NULL, &hints, &res0)) == 0) {
|
||||
freeaddrinfo(res0);
|
||||
res0 = NULL;
|
||||
tcpd_warn("host name/name mismatch: "
|
||||
@ -0,0 +1,97 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0009-tcp_wrappers-7.6-makefile-config.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -45,7 +45,7 @@ what:
|
||||
#
|
||||
# SysV.4 Solaris 2.x OSF AIX
|
||||
#REAL_DAEMON_DIR=/usr/sbin
|
||||
-#
|
||||
+REAL_DAEMON_DIR=/usr/sbin
|
||||
# BSD 4.4
|
||||
#REAL_DAEMON_DIR=/usr/libexec
|
||||
#
|
||||
@@ -513,6 +513,7 @@ VSYSLOG = -Dvsyslog=myvsyslog
|
||||
# (examples: allow, deny, banners, twist and spawn).
|
||||
#
|
||||
#STYLE = -DPROCESS_OPTIONS # Enable language extensions.
|
||||
+STYLE = "-DPROCESS_OPTIONS -DACLEXEC"
|
||||
|
||||
################################################################
|
||||
# Optional: Changing the default disposition of logfile records
|
||||
@@ -536,6 +537,7 @@ VSYSLOG = -Dvsyslog=myvsyslog
|
||||
# The LOG_XXX names below are taken from the /usr/include/syslog.h file.
|
||||
|
||||
FACILITY= LOG_MAIL # LOG_MAIL is what most sendmail daemons use
|
||||
+FACILITY= LOG_DAEMON
|
||||
|
||||
# The syslog priority at which successful connections are logged.
|
||||
|
||||
@@ -632,6 +634,7 @@ TABLES = -DHOSTS_DENY=\"/etc/hosts.deny\
|
||||
# lookups altogether, see the next section.
|
||||
|
||||
PARANOID= -DPARANOID
|
||||
+PARANOID=
|
||||
|
||||
########################################
|
||||
# Optional: turning off hostname lookups
|
||||
@@ -645,6 +648,7 @@ PARANOID= -DPARANOID
|
||||
# mode (see previous section) and comment out the following definition.
|
||||
|
||||
HOSTNAME= -DALWAYS_HOSTNAME
|
||||
+HOSTNAME=
|
||||
|
||||
#############################################
|
||||
# Optional: Turning on host ADDRESS checking
|
||||
@@ -671,6 +675,7 @@ HOSTNAME= -DALWAYS_HOSTNAME
|
||||
# Solaris 2.x, and Linux. See your system documentation for details.
|
||||
#
|
||||
# KILL_OPT= -DKILL_IP_OPTIONS
|
||||
+KILL_OPT= -DKILL_IP_OPTIONS
|
||||
|
||||
## End configuration options
|
||||
############################
|
||||
@@ -678,9 +683,10 @@ HOSTNAME= -DALWAYS_HOSTNAME
|
||||
# Protection against weird shells or weird make programs.
|
||||
|
||||
SHELL = /bin/sh
|
||||
-.c.o:; $(CC) $(CFLAGS) -c $*.c
|
||||
+.c.o:; $(CC) $(CFLAGS) -o $*.o -c $*.c
|
||||
|
||||
-CFLAGS = -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
|
||||
+COPTS = -O2 -g
|
||||
+CFLAGS = $(COPTS) -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
|
||||
$(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
|
||||
-DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \
|
||||
-DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \
|
||||
@@ -713,11 +719,12 @@ all other: config-check tcpd tcpdmatch t
|
||||
|
||||
config-check:
|
||||
@set +e; test -n "$(REAL_DAEMON_DIR)" || { make; exit 1; }
|
||||
- @set +e; echo $(CFLAGS) >/tmp/cflags.$$$$ ; \
|
||||
- if cmp cflags /tmp/cflags.$$$$ ; \
|
||||
- then rm /tmp/cflags.$$$$ ; \
|
||||
- else mv /tmp/cflags.$$$$ cflags ; \
|
||||
+ @set +e; echo $(CFLAGS) >cflags.new ; \
|
||||
+ if cmp cflags cflags.new ; \
|
||||
+ then rm cflags.new ; \
|
||||
+ else mv cflags.new cflags ; \
|
||||
fi >/dev/null 2>/dev/null
|
||||
+ @if [ ! -d shared ]; then mkdir shared; fi
|
||||
|
||||
$(LIB): $(LIB_OBJ)
|
||||
rm -f $(LIB)
|
||||
@ -0,0 +1,274 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0010-tcp_wrappers-7.6-sharedlib-weaksym.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -150,15 +150,15 @@ netbsd:
|
||||
|
||||
linux:
|
||||
@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
|
||||
- LIBS=-lnsl RANLIB=ranlib ARFLAGS=rv AUX_OBJ= \
|
||||
+ LIBS=-lnsl RANLIB=ranlib ARFLAGS=rv AUX_OBJ=weak_symbols.o \
|
||||
NETGROUP="-DNETGROUP" TLI= VSYSLOG= BUGS= \
|
||||
- EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len" all
|
||||
+ EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len" all
|
||||
|
||||
gnu:
|
||||
@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
|
||||
- LIBS=-lnsl RANLIB=ranlib ARFLAGS=rv AUX_OBJ= \
|
||||
+ LIBS=-lnsl RANLIB=ranlib ARFLAGS=rv AUX_OBJ=weak_symbols.o \
|
||||
NETGROUP=-DNETGROUP TLI= VSYSLOG= BUGS= \
|
||||
- EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DHAVE_STRERROR" all
|
||||
+ EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT" all
|
||||
|
||||
# This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x.
|
||||
hpux hpux8 hpux9 hpux10:
|
||||
@@ -713,7 +713,22 @@ KIT = README miscd.c tcpd.c fromhost.c h
|
||||
|
||||
LIB = libwrap.a
|
||||
|
||||
-all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk
|
||||
+shared/%.o: %.c
|
||||
+ $(CC) $(CFLAGS) $(SHCFLAGS) -c $< -o $@
|
||||
+
|
||||
+SOMAJOR = 0
|
||||
+SOMINOR = 7.6
|
||||
+
|
||||
+SHLIB = shared/libwrap.so.$(SOMAJOR).$(SOMINOR)
|
||||
+SHLIBSOMAJ = shared/libwrap.so.$(SOMAJOR)
|
||||
+SHLIBSO = shared/libwrap.so
|
||||
+SHLIBFLAGS = -Lshared -lwrap
|
||||
+
|
||||
+SHLINKFLAGS = -fpic -shared -Wl,-soname,libwrap.so.$(SOMAJOR) -Wl,--version-script=libwrap.lds $(LIBS)
|
||||
+SHCFLAGS = -fpic -shared -D_REENTRANT
|
||||
+SHLIB_OBJ= $(addprefix shared/, $(LIB_OBJ));
|
||||
+
|
||||
+all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk $(LIB)
|
||||
|
||||
# Invalidate all object files when the compiler options (CFLAGS) have changed.
|
||||
|
||||
@@ -731,27 +746,33 @@ $(LIB): $(LIB_OBJ)
|
||||
$(AR) $(ARFLAGS) $(LIB) $(LIB_OBJ)
|
||||
-$(RANLIB) $(LIB)
|
||||
|
||||
-tcpd: tcpd.o $(LIB)
|
||||
- $(CC) $(CFLAGS) -o $@ tcpd.o $(LIB) $(LIBS)
|
||||
+$(SHLIB): libwrap.lds $(SHLIB_OBJ)
|
||||
+ rm -f $(SHLIB)
|
||||
+ $(CC) -o $(SHLIB) $(SHLINKFLAGS) $(SHLIB_OBJ)
|
||||
+ ln -sf $(notdir $(SHLIB)) $(SHLIBSOMAJ)
|
||||
+ ln -sf $(notdir $(SHLIBSOMAJ)) $(SHLIBSO)
|
||||
+
|
||||
+tcpd: tcpd.o $(SHLIB)
|
||||
+ $(CC) $(CFLAGS) -o $@ tcpd.o $(SHLIBFLAGS)
|
||||
|
||||
miscd: miscd.o $(LIB)
|
||||
$(CC) $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS)
|
||||
|
||||
-safe_finger: safe_finger.o $(LIB)
|
||||
- $(CC) $(CFLAGS) -o $@ safe_finger.o $(LIB) $(LIBS)
|
||||
+safe_finger: safe_finger.o
|
||||
+ $(CC) $(CFLAGS) -o $@ safe_finger.o
|
||||
|
||||
TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o
|
||||
|
||||
-tcpdmatch: $(TCPDMATCH_OBJ) $(LIB)
|
||||
- $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(LIB) $(LIBS)
|
||||
+tcpdmatch: $(TCPDMATCH_OBJ) $(SHLIB)
|
||||
+ $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(SHLIBFLAGS)
|
||||
|
||||
-try-from: try-from.o fakelog.o $(LIB)
|
||||
- $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(LIB) $(LIBS)
|
||||
+try-from: try-from.o fakelog.o $(SHLIB)
|
||||
+ $(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(SHLIBFLAGS)
|
||||
|
||||
TCPDCHK_OBJ = tcpdchk.o fakelog.o inetcf.o scaffold.o
|
||||
|
||||
-tcpdchk: $(TCPDCHK_OBJ) $(LIB)
|
||||
- $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(LIB) $(LIBS)
|
||||
+tcpdchk: $(TCPDCHK_OBJ) $(SHLIB)
|
||||
+ $(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(SHLIBFLAGS)
|
||||
|
||||
shar: $(KIT)
|
||||
@shar $(KIT)
|
||||
@@ -767,7 +788,9 @@ archive:
|
||||
|
||||
clean:
|
||||
rm -f tcpd miscd safe_finger tcpdmatch tcpdchk try-from *.[oa] core \
|
||||
+ libwrap*.so* \
|
||||
cflags
|
||||
+ rm -rf shared/
|
||||
|
||||
tidy: clean
|
||||
chmod -R a+r .
|
||||
@@ -913,5 +936,6 @@ update.o: cflags
|
||||
update.o: mystdarg.h
|
||||
update.o: tcpd.h
|
||||
vfprintf.o: cflags
|
||||
+weak_symbols.o: tcpd.h
|
||||
workarounds.o: cflags
|
||||
workarounds.o: tcpd.h
|
||||
--- a/tcpd.h
|
||||
+++ b/tcpd.h
|
||||
@@ -4,6 +4,15 @@
|
||||
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
|
||||
*/
|
||||
|
||||
+#ifndef _TCPWRAPPERS_TCPD_H
|
||||
+#define _TCPWRAPPERS_TCPD_H
|
||||
+
|
||||
+/* Need definitions of struct sockaddr_in and FILE. */
|
||||
+#include <netinet/in.h>
|
||||
+#include <stdio.h>
|
||||
+
|
||||
+__BEGIN_DECLS
|
||||
+
|
||||
/* Structure to describe one communications endpoint. */
|
||||
|
||||
#define STRING_LENGTH 128 /* hosts, users, processes */
|
||||
@@ -29,10 +38,10 @@ struct request_info {
|
||||
char pid[10]; /* access via eval_pid(request) */
|
||||
struct host_info client[1]; /* client endpoint info */
|
||||
struct host_info server[1]; /* server endpoint info */
|
||||
- void (*sink) (); /* datagram sink function or 0 */
|
||||
- void (*hostname) (); /* address to printable hostname */
|
||||
- void (*hostaddr) (); /* address to printable address */
|
||||
- void (*cleanup) (); /* cleanup function or 0 */
|
||||
+ void (*sink) (int); /* datagram sink function or 0 */
|
||||
+ void (*hostname) (struct host_info *); /* address to printable hostname */
|
||||
+ void (*hostaddr) (struct host_info *); /* address to printable address */
|
||||
+ void (*cleanup) (struct request_info *); /* cleanup function or 0 */
|
||||
struct netconfig *config; /* netdir handle */
|
||||
};
|
||||
|
||||
@@ -70,20 +79,27 @@ extern void fromhost(); /* get/validat
|
||||
#define fromhost sock_host /* no TLI support needed */
|
||||
#endif
|
||||
|
||||
-extern int hosts_access(); /* access control */
|
||||
-extern void shell_cmd(); /* execute shell command */
|
||||
-extern char *percent_x(); /* do %<char> expansion */
|
||||
-extern void rfc931(); /* client name from RFC 931 daemon */
|
||||
-extern void clean_exit(); /* clean up and exit */
|
||||
-extern void refuse(); /* clean up and exit */
|
||||
-extern char *xgets(); /* fgets() on steroids */
|
||||
-extern char *split_at(); /* strchr() and split */
|
||||
-extern unsigned long dot_quad_addr(); /* restricted inet_addr() */
|
||||
+extern int hosts_access(struct request_info *request); /* access control */
|
||||
+extern void shell_cmd(char *); /* execute shell command */
|
||||
+extern char *percent_x(char *, int, char *, struct request_info *);
|
||||
+ /* do %<char> expansion */
|
||||
+extern void rfc931(struct sockaddr *, struct sockaddr *, char *);
|
||||
+ /* client name from RFC 931 daemon */
|
||||
+extern void clean_exit(struct request_info *); /* clean up and exit */
|
||||
+extern void refuse(struct request_info *); /* clean up and exit */
|
||||
+extern char *xgets(char *, int, FILE *); /* fgets() on steroids */
|
||||
+extern char *split_at(char *, int); /* strchr() and split */
|
||||
+extern unsigned long dot_quad_addr(char *); /* restricted inet_addr() */
|
||||
|
||||
/* Global variables. */
|
||||
|
||||
+#ifdef HAVE_WEAKSYMS
|
||||
+extern int allow_severity __attribute__ ((weak)); /* for connection logging */
|
||||
+extern int deny_severity __attribute__ ((weak)); /* for connection logging */
|
||||
+#else
|
||||
extern int allow_severity; /* for connection logging */
|
||||
extern int deny_severity; /* for connection logging */
|
||||
+#endif
|
||||
extern char *hosts_allow_table; /* for verification mode redirection */
|
||||
extern char *hosts_deny_table; /* for verification mode redirection */
|
||||
extern int hosts_access_verbose; /* for verbose matching mode */
|
||||
@@ -98,6 +114,8 @@ extern int resident; /* > 0 if residen
|
||||
#ifdef __STDC__
|
||||
extern struct request_info *request_init(struct request_info *,...);
|
||||
extern struct request_info *request_set(struct request_info *,...);
|
||||
+extern int hosts_ctl(char *daemon, char *client_name, char *client_addr,
|
||||
+ char *client_user);
|
||||
#else
|
||||
extern struct request_info *request_init(); /* initialize request */
|
||||
extern struct request_info *request_set(); /* update request structure */
|
||||
@@ -121,20 +139,23 @@ extern struct request_info *request_set(
|
||||
* host_info structures serve as caches for the lookup results.
|
||||
*/
|
||||
|
||||
-extern char *eval_user(); /* client user */
|
||||
-extern char *eval_hostname(); /* printable hostname */
|
||||
-extern char *eval_hostaddr(); /* printable host address */
|
||||
-extern char *eval_hostinfo(); /* host name or address */
|
||||
-extern char *eval_client(); /* whatever is available */
|
||||
-extern char *eval_server(); /* whatever is available */
|
||||
+extern char *eval_user(struct request_info *); /* client user */
|
||||
+extern char *eval_hostname(struct host_info *); /* printable hostname */
|
||||
+extern char *eval_hostaddr(struct host_info *); /* printable host address */
|
||||
+extern char *eval_hostinfo(struct host_info *); /* host name or address */
|
||||
+extern char *eval_client(struct request_info *);/* whatever is available */
|
||||
+extern char *eval_server(struct request_info *);/* whatever is available */
|
||||
#define eval_daemon(r) ((r)->daemon) /* daemon process name */
|
||||
#define eval_pid(r) ((r)->pid) /* process id */
|
||||
|
||||
/* Socket-specific methods, including DNS hostname lookups. */
|
||||
|
||||
-extern void sock_host(); /* look up endpoint addresses */
|
||||
-extern void sock_hostname(); /* translate address to hostname */
|
||||
-extern void sock_hostaddr(); /* address to printable address */
|
||||
+/* look up endpoint addresses */
|
||||
+extern void sock_host(struct request_info *);
|
||||
+/* translate address to hostname */
|
||||
+extern void sock_hostname(struct host_info *);
|
||||
+/* address to printable address */
|
||||
+extern void sock_hostaddr(struct host_info *);
|
||||
#define sock_methods(r) \
|
||||
{ (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; }
|
||||
|
||||
@@ -182,7 +203,7 @@ extern struct tcpd_context tcpd_context;
|
||||
* behavior.
|
||||
*/
|
||||
|
||||
-extern void process_options(); /* execute options */
|
||||
+extern void process_options(char *, struct request_info *);/* execute options */
|
||||
extern int dry_run; /* verification flag */
|
||||
|
||||
/* Bug workarounds. */
|
||||
@@ -221,3 +242,7 @@ extern char *fix_strtok();
|
||||
#define strtok my_strtok
|
||||
extern char *my_strtok();
|
||||
#endif
|
||||
+
|
||||
+__END_DECLS
|
||||
+
|
||||
+#endif
|
||||
--- /dev/null
|
||||
+++ b/weak_symbols.c
|
||||
@@ -0,0 +1,12 @@
|
||||
+ /*
|
||||
+ * @(#) weak_symbols.h 1.5 99/12/29 23:50
|
||||
+ *
|
||||
+ * Author: Anthony Towns <ajt@debian.org>
|
||||
+ */
|
||||
+
|
||||
+#ifdef HAVE_WEAKSYMS
|
||||
+#include "tcpd.h"
|
||||
+#include <syslog.h>
|
||||
+int deny_severity = LOG_WARNING;
|
||||
+int allow_severity = SEVERITY;
|
||||
+#endif
|
||||
--- /dev/null
|
||||
+++ b/libwrap.lds
|
||||
@@ -0,0 +1,4 @@
|
||||
+{
|
||||
+ local:
|
||||
+ aclexec_matched;
|
||||
+};
|
||||
@ -0,0 +1,82 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0011-tcp_wrappers-7.6-cidr-support.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5
|
||||
--- tcp_wrappers_7.6.orig/hosts_access.5 2003-08-21 03:15:36.000000000 +0200
|
||||
+++ tcp_wrappers_7.6/hosts_access.5 2003-08-21 03:15:31.000000000 +0200
|
||||
@@ -90,6 +90,10 @@
|
||||
pattern `131.155.72.0/255.255.254.0\' matches every address in the
|
||||
range `131.155.72.0\' through `131.155.73.255\'.
|
||||
.IP \(bu
|
||||
+An expression of the form `n.n.n.n/mm' is interpreted as a
|
||||
+`net/masklength' pair, where `mm' is the number of consecutive `1'
|
||||
+bits in the netmask applied to the `n.n.n.n' address.
|
||||
+.IP \(bu
|
||||
An expression of the form `[n:n:n:n:n:n:n:n]/m\' is interpreted as a
|
||||
`[net]/prefixlen\' pair. An IPv6 host address is matched if
|
||||
`prefixlen\' bits of `net\' is equal to the `prefixlen\' bits of the
|
||||
diff -ruN tcp_wrappers_7.6.orig/hosts_access.c tcp_wrappers_7.6/hosts_access.c
|
||||
--- tcp_wrappers_7.6.orig/hosts_access.c 2003-08-21 03:15:36.000000000 +0200
|
||||
+++ tcp_wrappers_7.6/hosts_access.c 2003-08-21 03:09:30.000000000 +0200
|
||||
@@ -417,7 +417,8 @@
|
||||
if ((addr = dot_quad_addr(string)) == INADDR_NONE)
|
||||
return (NO);
|
||||
if ((net = dot_quad_addr(net_tok)) == INADDR_NONE
|
||||
- || (mask = dot_quad_addr(mask_tok)) == INADDR_NONE) {
|
||||
+ || ((mask = dot_quad_addr(mask_tok)) == INADDR_NONE
|
||||
+ && (mask = cidr_mask_addr(mask_tok)) == 0)) {
|
||||
#ifndef INET6
|
||||
tcpd_warn("bad net/mask expression: %s/%s", net_tok, mask_tok);
|
||||
#endif
|
||||
diff -ruN tcp_wrappers_7.6.orig/misc.c tcp_wrappers_7.6/misc.c
|
||||
--- tcp_wrappers_7.6.orig/misc.c 2003-08-21 03:15:36.000000000 +0200
|
||||
+++ tcp_wrappers_7.6/misc.c 2003-08-21 03:09:30.000000000 +0200
|
||||
@@ -107,3 +107,17 @@
|
||||
}
|
||||
return (runs == 4 ? inet_addr(str) : INADDR_NONE);
|
||||
}
|
||||
+
|
||||
+/* cidr_mask_addr - convert cidr netmask length to internal form */
|
||||
+
|
||||
+unsigned long cidr_mask_addr(str)
|
||||
+char *str;
|
||||
+{
|
||||
+ int maskbits;
|
||||
+
|
||||
+ maskbits = atoi(str);
|
||||
+ if (maskbits < 1 || maskbits > 32)
|
||||
+ return (0);
|
||||
+ return htonl(0xFFFFFFFF << (32 - maskbits));
|
||||
+}
|
||||
+
|
||||
diff -ruN tcp_wrappers_7.6.orig/tcpdchk.c tcp_wrappers_7.6/tcpdchk.c
|
||||
--- tcp_wrappers_7.6.orig/tcpdchk.c 2003-08-21 03:15:36.000000000 +0200
|
||||
+++ tcp_wrappers_7.6/tcpdchk.c 2003-08-21 03:09:30.000000000 +0200
|
||||
@@ -497,12 +497,12 @@
|
||||
int mask_len;
|
||||
|
||||
if ((dot_quad_addr(pat) == INADDR_NONE
|
||||
- || dot_quad_addr(mask) == INADDR_NONE)
|
||||
+ || dot_quad_addr(mask) == INADDR_NONE && cidr_mask_addr(mask) == 0)
|
||||
&& (!is_inet6_addr(pat)
|
||||
|| ((mask_len = atoi(mask)) < 0 || mask_len > 128)))
|
||||
#else
|
||||
if (dot_quad_addr(pat) == INADDR_NONE
|
||||
- || dot_quad_addr(mask) == INADDR_NONE)
|
||||
+ || dot_quad_addr(mask) == INADDR_NONE && cidr_mask_addr(mask) == 0)
|
||||
#endif
|
||||
tcpd_warn("%s/%s: bad net/mask pattern", pat, mask);
|
||||
} else if (STR_EQ(pat, "FAIL")) { /* obsolete */
|
||||
@ -0,0 +1,28 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0012-tcp_wrappers-7.6-match-clarify.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5
|
||||
--- tcp_wrappers_7.6.orig/hosts_access.5 2004-04-25 12:17:59.000000000 +0200
|
||||
+++ tcp_wrappers_7.6/hosts_access.5 2004-04-25 12:17:53.000000000 +0200
|
||||
@@ -89,6 +89,8 @@
|
||||
bitwise AND of the address and the `mask\'. For example, the net/mask
|
||||
pattern `131.155.72.0/255.255.254.0\' matches every address in the
|
||||
range `131.155.72.0\' through `131.155.73.255\'.
|
||||
+`255.255.255.255\' is not a valid mask value, so a single host can be
|
||||
+matched just by its IP.
|
||||
.IP \(bu
|
||||
An expression of the form `n.n.n.n/mm' is interpreted as a
|
||||
`net/masklength' pair, where `mm' is the number of consecutive `1'
|
||||
@ -0,0 +1,153 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0013-tcp_wrappers-7.6-aclexec.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
diff -ruNp tcp_wrappers_7.6.orig/hosts_access.c tcp_wrappers_7.6/hosts_access.c
|
||||
--- tcp_wrappers_7.6.orig/hosts_access.c 2006-03-01 19:25:45.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/hosts_access.c 2006-03-01 19:23:58.000000000 +0100
|
||||
@@ -82,6 +82,9 @@ int hosts_access_verbose = 0;
|
||||
*/
|
||||
|
||||
int resident = (-1); /* -1, 0: unknown; +1: yes */
|
||||
+#ifdef ACLEXEC
|
||||
+int aclexec_matched = 0;
|
||||
+#endif
|
||||
|
||||
/* Forward declarations. */
|
||||
|
||||
@@ -185,6 +188,12 @@ struct request_info *request;
|
||||
if (sh_cmd) {
|
||||
#ifdef PROCESS_OPTIONS
|
||||
process_options(sh_cmd, request);
|
||||
+# ifdef ACLEXEC
|
||||
+ if (aclexec_matched) {
|
||||
+ syslog(LOG_INFO, "aclexec returned %d", aclexec_matched);
|
||||
+ match = NO;
|
||||
+ }
|
||||
+# endif
|
||||
#else
|
||||
char cmd[BUFSIZ];
|
||||
shell_cmd(percent_x(cmd, sizeof(cmd), sh_cmd, request));
|
||||
diff -ruNp tcp_wrappers_7.6.orig/options.c tcp_wrappers_7.6/options.c
|
||||
--- tcp_wrappers_7.6.orig/options.c 1996-02-11 17:01:32.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/options.c 2006-03-01 19:24:25.000000000 +0100
|
||||
@@ -47,6 +47,7 @@ static char sccsid[] = "@(#) options.c 1
|
||||
#include <ctype.h>
|
||||
#include <setjmp.h>
|
||||
#include <string.h>
|
||||
+#include <sys/wait.h>
|
||||
|
||||
#ifndef MAXPATHNAMELEN
|
||||
#define MAXPATHNAMELEN BUFSIZ
|
||||
@@ -76,6 +77,7 @@ static void group_option(); /* execute
|
||||
static void umask_option(); /* execute "umask mask" option */
|
||||
static void linger_option(); /* execute "linger time" option */
|
||||
static void keepalive_option(); /* execute "keepalive" option */
|
||||
+static void aclexec_option(); /* execute "aclexec command" option */
|
||||
static void spawn_option(); /* execute "spawn command" option */
|
||||
static void twist_option(); /* execute "twist command" option */
|
||||
static void rfc931_option(); /* execute "rfc931" option */
|
||||
@@ -113,6 +115,9 @@ static struct option option_table[] = {
|
||||
"umask", umask_option, NEED_ARG,
|
||||
"linger", linger_option, NEED_ARG,
|
||||
"keepalive", keepalive_option, 0,
|
||||
+#ifdef ACLEXEC
|
||||
+ "aclexec", aclexec_option, NEED_ARG | EXPAND_ARG,
|
||||
+#endif
|
||||
"spawn", spawn_option, NEED_ARG | EXPAND_ARG,
|
||||
"twist", twist_option, NEED_ARG | EXPAND_ARG | USE_LAST,
|
||||
"rfc931", rfc931_option, OPT_ARG,
|
||||
@@ -310,6 +315,54 @@ struct request_info *request;
|
||||
shell_cmd(value);
|
||||
}
|
||||
|
||||
+#ifdef ACLEXEC
|
||||
+/* aclexec_option - spawn a shell command and check status */
|
||||
+
|
||||
+/* ARGSUSED */
|
||||
+
|
||||
+static void aclexec_option(value, request)
|
||||
+char *value;
|
||||
+struct request_info *request;
|
||||
+{
|
||||
+ int status, child_pid, wait_pid;
|
||||
+ extern int aclexec_matched;
|
||||
+
|
||||
+ if (dry_run != 0)
|
||||
+ return;
|
||||
+
|
||||
+ child_pid = fork();
|
||||
+
|
||||
+ /* Something went wrong: we MUST terminate the process. */
|
||||
+ if (child_pid < 0) {
|
||||
+ tcpd_warn("aclexec_option: /bin/sh: %m");
|
||||
+ clean_exit(request);
|
||||
+ }
|
||||
+
|
||||
+ if (child_pid == 0) {
|
||||
+ execl("/bin/sh", "sh", "-c", value, (char *) 0);
|
||||
+
|
||||
+ /* Something went wrong. We MUST terminate the child process. */
|
||||
+ tcpd_warn("execl /bin/sh: %m");
|
||||
+ _exit(0);
|
||||
+ }
|
||||
+
|
||||
+ while ((wait_pid = wait(&status)) != -1 && wait_pid != child_pid)
|
||||
+ /* void */ ;
|
||||
+
|
||||
+ aclexec_matched = 1;
|
||||
+
|
||||
+ if (WIFEXITED(status) && WEXITSTATUS(status) == 0) {
|
||||
+ aclexec_matched = 0;
|
||||
+ }
|
||||
+
|
||||
+ if (WIFSIGNALED(status))
|
||||
+ tcpd_warn("process %d exited with signal %d", child_pid,
|
||||
+ WTERMSIG(status));
|
||||
+
|
||||
+ return;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
/* linger_option - set the socket linger time (Marc Boucher <marc@cam.org>) */
|
||||
|
||||
/* ARGSUSED */
|
||||
diff -ruNp tcp_wrappers_7.6.orig/hosts_options.5 tcp_wrappers_7.6/hosts_options.5
|
||||
--- tcp_wrappers_7.6.orig/hosts_options.5 2006-03-01 21:48:43.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/hosts_options.5 2006-03-01 21:47:39.000000000 +0100
|
||||
@@ -52,6 +52,23 @@ ALL: ALL: ALLOW
|
||||
.sp
|
||||
Notice the leading dot on the domain name patterns.
|
||||
.SH RUNNING OTHER COMMANDS
|
||||
+.IP "aclexec shell_command"
|
||||
+Execute, in a child process, the specified shell command, after
|
||||
+performing the %<letter> expansions described in the hosts_access(5)
|
||||
+manual page. The command is executed with stdin, stdout and stderr
|
||||
+connected to the null device, so that it won't mess up the
|
||||
+conversation with the client host. Example:
|
||||
+.sp
|
||||
+.nf
|
||||
+.ti +3
|
||||
+smtp : ALL : aclexec checkdnsbl %a
|
||||
+.fi
|
||||
+.sp
|
||||
+executes, in a background child process, the shell command "checkdnsbl %a"
|
||||
+after replacing %a by the address of the remote host.
|
||||
+.sp
|
||||
+The connection will be allowed or refused depending on whether the
|
||||
+command returns a true or false exit status.
|
||||
.IP "spawn shell_command"
|
||||
Execute, in a child process, the specified shell command, after
|
||||
performing the %<letter> expansions described in the hosts_access(5)
|
||||
@ -0,0 +1,87 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0014-tcp_wrappers-7.6-expand-remote-port.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
diff -ruN tcp_wrappers_7.6.orig/eval.c tcp_wrappers_7.6/eval.c
|
||||
--- tcp_wrappers_7.6.orig/eval.c 1995-01-30 19:51:46.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/eval.c 2004-11-04 13:59:01.000000000 +0100
|
||||
@@ -98,6 +98,28 @@
|
||||
}
|
||||
}
|
||||
|
||||
+/* eval_port - return string with the port */
|
||||
+char *eval_port(saddr)
|
||||
+#ifdef INET6
|
||||
+struct sockaddr *saddr;
|
||||
+#else
|
||||
+struct sockaddr_in *saddr;
|
||||
+#endif
|
||||
+{
|
||||
+ static char port[16];
|
||||
+ if (saddr != 0) {
|
||||
+ sprintf(port, "%u",
|
||||
+#ifdef INET6
|
||||
+ ntohs(((struct sockaddr_in *)saddr)->sin_port));
|
||||
+#else
|
||||
+ ntohs(saddr->sin_port));
|
||||
+#endif
|
||||
+ } else {
|
||||
+ strcpy(port, "0");
|
||||
+ }
|
||||
+ return (port);
|
||||
+}
|
||||
+
|
||||
/* eval_client - return string with as much about the client as we know */
|
||||
|
||||
char *eval_client(request)
|
||||
diff -ruN tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5
|
||||
--- tcp_wrappers_7.6.orig/hosts_access.5 2004-11-04 13:17:45.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/hosts_access.5 2004-11-04 13:55:32.000000000 +0100
|
||||
@@ -175,6 +175,8 @@
|
||||
unavailable.
|
||||
.IP "%n (%N)"
|
||||
The client (server) host name (or "unknown" or "paranoid").
|
||||
+.IP "%r (%R)"
|
||||
+The clients (servers) port number (or "0").
|
||||
.IP %p
|
||||
The daemon process id.
|
||||
.IP %s
|
||||
diff -ruN tcp_wrappers_7.6.orig/percent_x.c tcp_wrappers_7.6/percent_x.c
|
||||
--- tcp_wrappers_7.6.orig/percent_x.c 1994-12-28 17:42:38.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/percent_x.c 2004-11-04 13:19:29.000000000 +0100
|
||||
@@ -63,6 +63,8 @@
|
||||
ch == 'n' ? eval_hostname(request->client) :
|
||||
ch == 'N' ? eval_hostname(request->server) :
|
||||
ch == 'p' ? eval_pid(request) :
|
||||
+ ch == 'r' ? eval_port(request->client->sin) :
|
||||
+ ch == 'R' ? eval_port(request->server->sin) :
|
||||
ch == 's' ? eval_server(request) :
|
||||
ch == 'u' ? eval_user(request) :
|
||||
ch == '%' ? "%" : (tcpd_warn("unrecognized %%%c", ch), "");
|
||||
diff -ruN tcp_wrappers_7.6.orig/tcpd.h tcp_wrappers_7.6/tcpd.h
|
||||
--- tcp_wrappers_7.6.orig/tcpd.h 2004-11-04 13:17:45.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/tcpd.h 2004-11-04 13:19:13.000000000 +0100
|
||||
@@ -145,6 +145,11 @@
|
||||
extern char *eval_hostinfo(struct host_info *); /* host name or address */
|
||||
extern char *eval_client(struct request_info *);/* whatever is available */
|
||||
extern char *eval_server(struct request_info *);/* whatever is available */
|
||||
+#ifdef INET6
|
||||
+extern char *eval_port(struct sockaddr *);
|
||||
+#else
|
||||
+extern char *eval_port(struct sockaddr_in *);
|
||||
+#endif
|
||||
#define eval_daemon(r) ((r)->daemon) /* daemon process name */
|
||||
#define eval_pid(r) ((r)->pid) /* process id */
|
||||
|
||||
@ -0,0 +1,103 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0015-tcp_wrappers-7.6-catch-sigchld.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
--- tcp_wrappers_7.6/shell_cmd.c.sigchld 1994-12-28 17:42:44.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/shell_cmd.c 2007-06-28 15:42:17.000000000 +0200
|
||||
@@ -20,6 +20,11 @@
|
||||
#include <stdio.h>
|
||||
#include <syslog.h>
|
||||
#include <string.h>
|
||||
+#include <errno.h>
|
||||
+#include <unistd.h>
|
||||
+#include <sys/wait.h>
|
||||
+#include <sys/stat.h>
|
||||
+#include <fcntl.h>
|
||||
|
||||
extern void exit();
|
||||
|
||||
@@ -31,13 +36,42 @@
|
||||
|
||||
static void do_child();
|
||||
|
||||
+/*
|
||||
+ * The sigchld handler. If there is a SIGCHLD caused by a child other than
|
||||
+ * ours, we set a flag and raise the signal later.
|
||||
+ */
|
||||
+volatile static int foreign_sigchld;
|
||||
+volatile static int our_child_pid;
|
||||
+static void sigchld(int sig, siginfo_t *si, void *unused)
|
||||
+{
|
||||
+ if (si && si->si_pid != our_child_pid)
|
||||
+ foreign_sigchld = 1;
|
||||
+}
|
||||
+
|
||||
/* shell_cmd - execute shell command */
|
||||
|
||||
void shell_cmd(command)
|
||||
char *command;
|
||||
{
|
||||
int child_pid;
|
||||
- int wait_pid;
|
||||
+
|
||||
+ struct sigaction new_action, old_action;
|
||||
+ sigset_t new_mask, old_mask, empty_mask;
|
||||
+
|
||||
+ new_action.sa_sigaction = &sigchld;
|
||||
+ new_action.sa_flags = SA_SIGINFO;
|
||||
+ sigemptyset(&new_action.sa_mask);
|
||||
+ sigemptyset(&new_mask);
|
||||
+ sigemptyset(&empty_mask);
|
||||
+ sigaddset(&new_mask, SIGCHLD);
|
||||
+
|
||||
+ /*
|
||||
+ * Set the variables for handler, set the handler and block the signal
|
||||
+ * until we have the pid.
|
||||
+ */
|
||||
+ foreign_sigchld = 0; our_child_pid = 0;
|
||||
+ sigprocmask(SIG_BLOCK, &new_mask, &old_mask);
|
||||
+ sigaction(SIGCHLD, &new_action, &old_action);
|
||||
|
||||
/*
|
||||
* Most of the work is done within the child process, to minimize the
|
||||
@@ -49,12 +83,26 @@
|
||||
tcpd_warn("cannot fork: %m");
|
||||
break;
|
||||
case 00: /* child */
|
||||
+ /* Clear the blocked mask for the child not to be surprised. */
|
||||
+ sigprocmask(SIG_SETMASK, &empty_mask, 0);
|
||||
do_child(command);
|
||||
/* NOTREACHED */
|
||||
default: /* parent */
|
||||
- while ((wait_pid = wait((int *) 0)) != -1 && wait_pid != child_pid)
|
||||
- /* void */ ;
|
||||
+ our_child_pid = child_pid;
|
||||
+ sigprocmask(SIG_UNBLOCK, &new_mask, 0);
|
||||
+ while (waitpid(child_pid, (int *) 0, 0) == -1 && errno == EINTR);
|
||||
}
|
||||
+
|
||||
+ /*
|
||||
+ * Revert the signal mask and the SIGCHLD handler.
|
||||
+ */
|
||||
+ sigprocmask(SIG_SETMASK, &old_mask, 0);
|
||||
+ sigaction(SIGCHLD, &old_action, 0);
|
||||
+
|
||||
+ /* If there was a foreign SIGCHLD, raise it after we have restored the old
|
||||
+ * mask and handler. */
|
||||
+ if (foreign_sigchld)
|
||||
+ raise(SIGCHLD);
|
||||
}
|
||||
|
||||
/* do_child - exec command with { stdin, stdout, stderr } to /dev/null */
|
||||
@ -0,0 +1,50 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0016-tcp_wrappers-7.6-fix-warnings.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
diff -ruNp tcp_wrappers_7.6.orig/fix_options.c tcp_wrappers_7.6/fix_options.c
|
||||
--- tcp_wrappers_7.6.orig/fix_options.c 2006-03-01 23:45:28.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/fix_options.c 2006-03-01 23:45:25.000000000 +0100
|
||||
@@ -50,7 +50,7 @@ struct request_info *request;
|
||||
struct in_addr dummy;
|
||||
#ifdef INET6
|
||||
struct sockaddr_storage ss;
|
||||
- int sslen;
|
||||
+ socklen_t sslen;
|
||||
|
||||
/*
|
||||
* check if this is AF_INET socket
|
||||
diff -ruNp tcp_wrappers_7.6.orig/options.c tcp_wrappers_7.6/options.c
|
||||
--- tcp_wrappers_7.6.orig/options.c 2006-03-01 23:45:28.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/options.c 2006-03-01 22:55:44.000000000 +0100
|
||||
@@ -41,6 +41,7 @@ static char sccsid[] = "@(#) options.c 1
|
||||
#include <netinet/in.h>
|
||||
#include <netdb.h>
|
||||
#include <stdio.h>
|
||||
+#include <unistd.h>
|
||||
#include <syslog.h>
|
||||
#include <pwd.h>
|
||||
#include <grp.h>
|
||||
diff -ruNp tcp_wrappers_7.6.orig/scaffold.c tcp_wrappers_7.6/scaffold.c
|
||||
--- tcp_wrappers_7.6.orig/scaffold.c 2006-03-01 23:45:28.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/scaffold.c 2006-03-01 22:56:13.000000000 +0100
|
||||
@@ -17,6 +17,7 @@ static char sccs_id[] = "@(#) scaffold.c
|
||||
#include <arpa/inet.h>
|
||||
#include <netdb.h>
|
||||
#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
#include <syslog.h>
|
||||
#include <setjmp.h>
|
||||
#include <string.h>
|
||||
@ -0,0 +1,35 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0017-tcp_wrappers-7.6-have-strerror.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
diff -ruN tcp_wrappers_7.6.orig/percent_m.c tcp_wrappers_7.6/percent_m.c
|
||||
--- tcp_wrappers_7.6.orig/percent_m.c 1994-12-28 17:42:37.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/percent_m.c 2003-08-21 02:45:31.000000000 +0200
|
||||
@@ -29,11 +29,15 @@
|
||||
|
||||
while (*bp = *cp)
|
||||
if (*cp == '%' && cp[1] == 'm') {
|
||||
+#ifdef HAVE_STRERROR
|
||||
+ strcpy(bp, strerror(errno));
|
||||
+#else
|
||||
if (errno < sys_nerr && errno > 0) {
|
||||
strcpy(bp, sys_errlist[errno]);
|
||||
} else {
|
||||
sprintf(bp, "Unknown error %d", errno);
|
||||
}
|
||||
+#endif
|
||||
bp += strlen(bp);
|
||||
cp += 2;
|
||||
} else {
|
||||
@ -0,0 +1,37 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0018-tcp_wrappers-7.6-man-fromhost.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
diff -ruN tcp_wrappers_7.6.orig/hosts_access.3 tcp_wrappers_7.6/hosts_access.3
|
||||
--- tcp_wrappers_7.6.orig/hosts_access.3 2004-04-25 00:10:48.000000000 +0200
|
||||
+++ tcp_wrappers_7.6/hosts_access.3 2004-04-25 00:09:36.000000000 +0200
|
||||
@@ -14,6 +14,9 @@
|
||||
struct request_info *request_set(request, key, value, ..., 0)
|
||||
struct request_info *request;
|
||||
|
||||
+void fromhost(request)
|
||||
+struct request_info *request;
|
||||
+
|
||||
int hosts_access(request)
|
||||
struct request_info *request;
|
||||
|
||||
@@ -60,6 +63,7 @@
|
||||
is available, host names and client user names are looked up on demand,
|
||||
using the request structure as a cache. hosts_access() returns zero if
|
||||
access should be denied.
|
||||
+fromhost() must be called before hosts_access().
|
||||
.PP
|
||||
hosts_ctl() is a wrapper around the request_init() and hosts_access()
|
||||
routines with a perhaps more convenient interface (though it does not
|
||||
@ -0,0 +1,110 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0019-tcp_wrappers-7.6-more-man-pages.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
Description: Upstream changes introduced in version 7.6.q-19
|
||||
This patch has been created by dpkg-source during the package build.
|
||||
Here's the last changelog entry, hopefully it gives details on why
|
||||
those changes were made:
|
||||
.
|
||||
tcp-wrappers (7.6.q-19) unstable; urgency=low
|
||||
.
|
||||
* Made piuparts happy by removing /etc/hosts.{allow,deny} on purge, even
|
||||
if the package is never purged on real systems.
|
||||
.
|
||||
The person named in the Author field signed this changelog entry.
|
||||
Author: Marco d'Itri <md@linux.it>
|
||||
|
||||
---
|
||||
The information above should follow the Patch Tagging Guidelines, please
|
||||
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
|
||||
are templates for supplementary fields that you might want to add:
|
||||
|
||||
Origin: <vendor|upstream|other>, <url of original patch>
|
||||
Bug: <url in upstream bugtracker>
|
||||
Bug-Debian: http://bugs.debian.org/<bugnumber>
|
||||
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
|
||||
Forwarded: <no|not-needed|url proving that it has been forwarded>
|
||||
Reviewed-By: <name and email of someone who approved the patch>
|
||||
Last-Update: <YYYY-MM-DD>
|
||||
|
||||
--- /dev/null
|
||||
+++ tcp-wrappers-7.6.q/try-from.8
|
||||
@@ -0,0 +1,28 @@
|
||||
+.TH TRY-FROM 8 "21th June 1997" Linux "Linux Programmer's Manual"
|
||||
+.SH NAME
|
||||
+try-from \- test program for the tcp_wrapper
|
||||
+.SH SYNOPSIS
|
||||
+.B try-from
|
||||
+.SH DESCRIPTION
|
||||
+The
|
||||
+.B try\-from
|
||||
+command can be called via a remote shell command to find out
|
||||
+if the hostname and address are properly recognized
|
||||
+by the
|
||||
+.B tcp_wrapper
|
||||
+library, if username lookup works, and (SysV only) if the TLI
|
||||
+on top of IP heuristics work. Diagnostics are reported through
|
||||
+.BR syslog (3)
|
||||
+and redirected to stderr.
|
||||
+
|
||||
+Example:
|
||||
+
|
||||
+rsh host /some/where/try\-from
|
||||
+
|
||||
+.SH SEE ALSO
|
||||
+.BR hosts_access (5),
|
||||
+.BR hosts_options (5),
|
||||
+.BR tcpd (8)
|
||||
+.SH AUTHOR
|
||||
+Wietse Venema, Eindhoven University of Technology, The Netherlands.
|
||||
+
|
||||
--- /dev/null
|
||||
+++ tcp-wrappers-7.6.q/safe_finger.8
|
||||
@@ -0,0 +1,34 @@
|
||||
+.TH SAFE_FINGER 8 "21th June 1997" Linux "Linux Programmer's Manual"
|
||||
+.SH NAME
|
||||
+safe_finger \- finger client wrapper that protects against nasty stuff
|
||||
+from finger servers
|
||||
+.SH SYNOPSIS
|
||||
+.B safe_finger [finger_options]
|
||||
+.SH DESCRIPTION
|
||||
+The
|
||||
+.B safe_finger
|
||||
+command protects against nasty stuff from finger servers. Use this
|
||||
+program for automatic reverse finger probes from the
|
||||
+.B tcp_wrapper
|
||||
+.B (tcpd)
|
||||
+, not the raw finger command. The
|
||||
+.B safe_finger
|
||||
+command makes sure that the finger client is not run with root
|
||||
+privileges. It also runs the finger client with a defined PATH
|
||||
+environment.
|
||||
+.B safe_finger
|
||||
+will also protect you from problems caused by the output of some
|
||||
+finger servers. The problem: some programs may react to stuff in
|
||||
+the first column. Other programs may get upset by thrash anywhere
|
||||
+on a line. File systems may fill up as the finger server keeps
|
||||
+sending data. Text editors may bomb out on extremely long lines.
|
||||
+The finger server may take forever because it is somehow wedged.
|
||||
+.B safe_finger
|
||||
+takes care of all this badness.
|
||||
+.SH SEE ALSO
|
||||
+.BR hosts_access (5),
|
||||
+.BR hosts_options (5),
|
||||
+.BR tcpd (8)
|
||||
+.SH AUTHOR
|
||||
+Wietse Venema, Eindhoven University of Technology, The Netherlands.
|
||||
+
|
||||
@ -0,0 +1,80 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0020-tcp_wrappers-7.6-match-port.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
diff -ruNp tcp_wrappers_7.6.orig/hosts_access.c tcp_wrappers_7.6/hosts_access.c
|
||||
--- tcp_wrappers_7.6.orig/hosts_access.c 2007-01-08 01:31:32.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/hosts_access.c 2007-01-08 01:31:08.000000000 +0100
|
||||
@@ -232,6 +232,36 @@ int (*match_fn) ();
|
||||
return (NO);
|
||||
}
|
||||
|
||||
+/*
|
||||
+ * daemon_or_port_match - match server information: if the server endpoint
|
||||
+ * pattern is a port number, match against port number of connection;
|
||||
+ * otherwise match against daemon executable name
|
||||
+ */
|
||||
+
|
||||
+static int daemon_or_port_match(char *tok, struct request_info *request) {
|
||||
+ unsigned int port, sin_port;
|
||||
+ char junk;
|
||||
+
|
||||
+ /* daemon name */
|
||||
+ if (sscanf(tok, "%u%c", &port, &junk) != 1 || port > 65535)
|
||||
+ return (string_match(tok, eval_daemon(request)));
|
||||
+
|
||||
+ /* port number */
|
||||
+ if (!request->server->sin)
|
||||
+ return (NO);
|
||||
+
|
||||
+#ifdef INET6
|
||||
+ sin_port = ntohs(((struct sockaddr_in *)request->server->sin)->sin_port);
|
||||
+#else
|
||||
+ sin_port = ntohs(request->server->sin->sin_port);
|
||||
+#endif
|
||||
+
|
||||
+ if (port == sin_port)
|
||||
+ return (YES);
|
||||
+ else
|
||||
+ return (NO);
|
||||
+}
|
||||
+
|
||||
/* server_match - match server information */
|
||||
|
||||
static int server_match(tok, request)
|
||||
@@ -241,9 +271,9 @@ struct request_info *request;
|
||||
char *host;
|
||||
|
||||
if ((host = split_at(tok + 1, '@')) == 0) { /* plain daemon */
|
||||
- return (string_match(tok, eval_daemon(request)));
|
||||
+ return (daemon_or_port_match(tok, request));
|
||||
} else { /* daemon@host */
|
||||
- return (string_match(tok, eval_daemon(request))
|
||||
+ return (daemon_or_port_match(tok, request)
|
||||
&& host_match(host, request->server));
|
||||
}
|
||||
}
|
||||
diff -ruNp tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5
|
||||
--- tcp_wrappers_7.6.orig/hosts_access.5 2007-01-08 01:31:32.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/hosts_access.5 2007-01-08 01:30:18.000000000 +0100
|
||||
@@ -51,7 +51,7 @@ being optional:
|
||||
daemon_list : client_list [ : shell_command ]
|
||||
.PP
|
||||
\fIdaemon_list\fR is a list of one or more daemon process names
|
||||
-(argv[0] values) or wildcards (see below).
|
||||
+(argv[0] values) or server port numbers or wildcards (see below).
|
||||
.PP
|
||||
\fIclient_list\fR is a list
|
||||
of one or more host names, host addresses, patterns or wildcards (see
|
||||
@ -0,0 +1,53 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0021-tcp_wrappers-7.6-restore-sigalarm.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
diff -ruN tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c
|
||||
--- tcp_wrappers_7.6.orig/rfc931.c 2004-08-29 18:40:08.000000000 +0200
|
||||
+++ tcp_wrappers_7.6/rfc931.c 2004-08-29 18:40:02.000000000 +0200
|
||||
@@ -92,6 +92,8 @@
|
||||
char *cp;
|
||||
char *result = unknown;
|
||||
FILE *fp;
|
||||
+ unsigned saved_timeout;
|
||||
+ struct sigaction nact, oact;
|
||||
|
||||
#ifdef INET6
|
||||
/* address family must be the same */
|
||||
@@ -134,7 +136,12 @@
|
||||
*/
|
||||
|
||||
if (setjmp(timebuf) == 0) {
|
||||
- signal(SIGALRM, timeout);
|
||||
+ /* Save SIGALRM timer and handler. Sudheer Abdul-Salam, SUN. */
|
||||
+ saved_timeout = alarm(0);
|
||||
+ nact.sa_handler = timeout;
|
||||
+ nact.sa_flags = 0;
|
||||
+ (void) sigemptyset(&nact.sa_mask);
|
||||
+ (void) sigaction(SIGALRM, &nact, &oact);
|
||||
alarm(rfc931_timeout);
|
||||
|
||||
/*
|
||||
@@ -223,6 +230,10 @@
|
||||
}
|
||||
alarm(0);
|
||||
}
|
||||
+ /* Restore SIGALRM timer and handler. Sudheer Abdul-Salam, SUN. */
|
||||
+ (void) sigaction(SIGALRM, &oact, NULL);
|
||||
+ if (saved_timeout > 0)
|
||||
+ alarm(saved_timeout);
|
||||
fclose(fp);
|
||||
}
|
||||
STRN_CPY(dest, result, STRING_LENGTH);
|
||||
@ -0,0 +1,55 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0022-tcp_wrappers-7.6-rfc931.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
diff -ruNp tcp_wrappers_7.6.orig/scaffold.c tcp_wrappers_7.6/scaffold.c
|
||||
--- tcp_wrappers_7.6.orig/scaffold.c 2005-03-09 18:22:04.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/scaffold.c 2005-03-09 18:20:47.000000000 +0100
|
||||
@@ -237,10 +237,17 @@ struct request_info *request;
|
||||
|
||||
/* ARGSUSED */
|
||||
|
||||
-void rfc931(request)
|
||||
-struct request_info *request;
|
||||
+void rfc931(rmt_sin, our_sin, dest)
|
||||
+#ifdef INET6
|
||||
+struct sockaddr *rmt_sin;
|
||||
+struct sockaddr *our_sin;
|
||||
+#else
|
||||
+struct sockaddr_in *rmt_sin;
|
||||
+struct sockaddr_in *our_sin;
|
||||
+#endif
|
||||
+char *dest;
|
||||
{
|
||||
- strcpy(request->user, unknown);
|
||||
+ strcpy(dest, unknown);
|
||||
}
|
||||
|
||||
/* check_path - examine accessibility */
|
||||
diff -ruNp tcp_wrappers_7.6.orig/tcpd.h tcp_wrappers_7.6/tcpd.h
|
||||
--- tcp_wrappers_7.6.orig/tcpd.h 2005-03-09 18:22:04.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/tcpd.h 2005-03-09 18:21:23.000000000 +0100
|
||||
@@ -83,7 +83,11 @@ extern int hosts_access(struct request_i
|
||||
extern void shell_cmd(char *); /* execute shell command */
|
||||
extern char *percent_x(char *, int, char *, struct request_info *);
|
||||
/* do %<char> expansion */
|
||||
+#ifdef INET6
|
||||
extern void rfc931(struct sockaddr *, struct sockaddr *, char *);
|
||||
+#else
|
||||
+extern void rfc931(struct sockaddr_in *, struct sockaddr_in *, char *);
|
||||
+#endif
|
||||
/* client name from RFC 931 daemon */
|
||||
extern void clean_exit(struct request_info *); /* clean up and exit */
|
||||
extern void refuse(struct request_info *); /* clean up and exit */
|
||||
@ -0,0 +1,45 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0023-tcp_wrappers-7.6-safe_finger.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
--- tcp-wrappers-7.6-ipv6.1.orig/safe_finger.c
|
||||
+++ tcp-wrappers-7.6-ipv6.1/safe_finger.c
|
||||
@@ -26,21 +26,24 @@
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include <pwd.h>
|
||||
+#include <syslog.h>
|
||||
|
||||
extern void exit();
|
||||
|
||||
/* Local stuff */
|
||||
|
||||
-char path[] = "PATH=/bin:/usr/bin:/usr/ucb:/usr/bsd:/etc:/usr/etc:/usr/sbin";
|
||||
+char path[] = "PATH=/bin:/usr/bin:/sbin:/usr/sbin";
|
||||
|
||||
#define TIME_LIMIT 60 /* Do not keep listinging forever */
|
||||
#define INPUT_LENGTH 100000 /* Do not keep listinging forever */
|
||||
#define LINE_LENGTH 128 /* Editors can choke on long lines */
|
||||
#define FINGER_PROGRAM "finger" /* Most, if not all, UNIX systems */
|
||||
#define UNPRIV_NAME "nobody" /* Preferred privilege level */
|
||||
-#define UNPRIV_UGID 32767 /* Default uid and gid */
|
||||
+#define UNPRIV_UGID 65534 /* Default uid and gid */
|
||||
|
||||
int finger_pid;
|
||||
+int allow_severity = SEVERITY;
|
||||
+int deny_severity = LOG_WARNING;
|
||||
|
||||
void cleanup(sig)
|
||||
int sig;
|
||||
@ -0,0 +1,60 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0024-tcp_wrappers-7.6-sig-fix.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
* Fri May 6 2005 Thomas Woerner <twoerner@redhat.com> 7.6-39
|
||||
- fixed sig patch (#141110). Thanks to Nikita Shulga for the patch
|
||||
|
||||
* Mon Feb 10 2003 Harald Hoyer <harald@redhat.de> 7.6-29
|
||||
- added security patch tcp_wrappers-7.6-sig.patch
|
||||
|
||||
diff -ruNp tcp_wrappers_7.6.orig/hosts_access.c tcp_wrappers_7.6/hosts_access.c
|
||||
--- tcp_wrappers_7.6.orig/hosts_access.c 2006-03-01 22:14:14.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/hosts_access.c 2006-03-01 22:14:11.000000000 +0100
|
||||
@@ -66,6 +66,7 @@ static char sep[] = ", \t\r\n";
|
||||
|
||||
#define YES 1
|
||||
#define NO 0
|
||||
+#define ERR -1
|
||||
|
||||
/*
|
||||
* These variables are globally visible so that they can be redirected in
|
||||
@@ -130,11 +131,11 @@ struct request_info *request;
|
||||
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))
|
||||
- return (NO);
|
||||
- return (YES);
|
||||
+ if (table_match(hosts_deny_table, request) == NO)
|
||||
+ return (YES);
|
||||
+ return (NO);
|
||||
}
|
||||
|
||||
/* table_match - match table entries with (daemon, client) pair */
|
||||
@@ -178,8 +179,9 @@ struct request_info *request;
|
||||
(void) fclose(fp);
|
||||
} else if (errno != ENOENT) {
|
||||
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);
|
||||
@ -0,0 +1,46 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0025-tcp_wrappers-7.6-siglongjmp.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
diff -ruNp tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c
|
||||
--- tcp_wrappers_7.6.orig/rfc931.c 2004-08-29 18:42:25.000000000 +0200
|
||||
+++ tcp_wrappers_7.6/rfc931.c 2004-08-29 18:41:04.000000000 +0200
|
||||
@@ -33,7 +33,7 @@ static char sccsid[] = "@(#) rfc931.c 1.
|
||||
|
||||
int rfc931_timeout = RFC931_TIMEOUT;/* Global so it can be changed */
|
||||
|
||||
-static jmp_buf timebuf;
|
||||
+static sigjmp_buf timebuf;
|
||||
|
||||
/* fsocket - open stdio stream on top of socket */
|
||||
|
||||
@@ -62,7 +62,7 @@ int protocol;
|
||||
static void timeout(sig)
|
||||
int sig;
|
||||
{
|
||||
- longjmp(timebuf, sig);
|
||||
+ siglongjmp(timebuf, sig);
|
||||
}
|
||||
|
||||
/* rfc931 - return remote user name, given socket structures */
|
||||
@@ -135,7 +135,7 @@ char *dest;
|
||||
* Set up a timer so we won't get stuck while waiting for the server.
|
||||
*/
|
||||
|
||||
- if (setjmp(timebuf) == 0) {
|
||||
+ if (sigsetjmp(timebuf, 1) == 0) {
|
||||
/* Save SIGALRM timer and handler. Sudheer Abdul-Salam, SUN. */
|
||||
saved_timeout = alarm(0);
|
||||
nact.sa_handler = timeout;
|
||||
@ -0,0 +1,58 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/0026-tcp_wrappers-7.6-size_t.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
diff -ruN tcp_wrappers_7.6.orig/fix_options.c tcp_wrappers_7.6/fix_options.c
|
||||
--- tcp_wrappers_7.6.orig/fix_options.c 2003-08-21 03:41:33.000000000 +0200
|
||||
+++ tcp_wrappers_7.6/fix_options.c 2003-08-21 03:41:27.000000000 +0200
|
||||
@@ -38,7 +38,11 @@
|
||||
#ifdef IP_OPTIONS
|
||||
unsigned char optbuf[BUFFER_SIZE / 3], *cp;
|
||||
char lbuf[BUFFER_SIZE], *lp;
|
||||
+#ifdef __GLIBC__
|
||||
+ size_t optsize = sizeof(optbuf), ipproto;
|
||||
+#else
|
||||
int optsize = sizeof(optbuf), ipproto;
|
||||
+#endif
|
||||
struct protoent *ip;
|
||||
int fd = request->fd;
|
||||
unsigned int opt;
|
||||
diff -ruN tcp_wrappers_7.6.orig/socket.c tcp_wrappers_7.6/socket.c
|
||||
--- tcp_wrappers_7.6.orig/socket.c 2003-08-21 03:41:33.000000000 +0200
|
||||
+++ tcp_wrappers_7.6/socket.c 2003-08-21 03:40:51.000000000 +0200
|
||||
@@ -90,7 +90,11 @@
|
||||
static struct sockaddr_in client;
|
||||
static struct sockaddr_in server;
|
||||
#endif
|
||||
+#ifdef __GLIBC__
|
||||
+ size_t len;
|
||||
+#else
|
||||
int len;
|
||||
+#endif
|
||||
char buf[BUFSIZ];
|
||||
int fd = request->fd;
|
||||
|
||||
@@ -421,7 +425,11 @@
|
||||
#else
|
||||
struct sockaddr_in sin;
|
||||
#endif
|
||||
+#ifdef __GLIBC__
|
||||
+ size_t size = sizeof(sin);
|
||||
+#else
|
||||
int size = sizeof(sin);
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* Eat up the not-yet received datagram. Some systems insist on a
|
||||
@ -1,82 +0,0 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/config.patch
|
||||
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
||||
# Copyright (C) 1998 - 2003 Clifford Wolf
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
--- ./Makefile.orig Fri Mar 21 19:27:21 1997
|
||||
+++ ./Makefile Fri Apr 23 11:02:43 1999
|
||||
@@ -44,7 +44,7 @@
|
||||
#REAL_DAEMON_DIR=/usr/etc
|
||||
#
|
||||
# SysV.4 Solaris 2.x OSF AIX
|
||||
-#REAL_DAEMON_DIR=/usr/sbin
|
||||
+REAL_DAEMON_DIR=/usr/sbin
|
||||
#
|
||||
# BSD 4.4
|
||||
#REAL_DAEMON_DIR=/usr/libexec
|
||||
@@ -144,7 +144,7 @@
|
||||
linux:
|
||||
@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
|
||||
LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \
|
||||
- NETGROUP= TLI= EXTRA_CFLAGS="-DBROKEN_SO_LINGER" all
|
||||
+ NETGROUP= TLI= EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DBROKEN_SO_LINGER" all
|
||||
|
||||
# This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x.
|
||||
hpux hpux8 hpux9 hpux10:
|
||||
@@ -491,7 +491,7 @@
|
||||
# Uncomment the next definition to turn on the language extensions
|
||||
# (examples: allow, deny, banners, twist and spawn).
|
||||
#
|
||||
-#STYLE = -DPROCESS_OPTIONS # Enable language extensions.
|
||||
+STYLE = -DPROCESS_OPTIONS # Enable language extensions.
|
||||
|
||||
################################################################
|
||||
# Optional: Changing the default disposition of logfile records
|
||||
@@ -514,7 +514,7 @@
|
||||
#
|
||||
# The LOG_XXX names below are taken from the /usr/include/syslog.h file.
|
||||
|
||||
-FACILITY= LOG_MAIL # LOG_MAIL is what most sendmail daemons use
|
||||
+FACILITY= LOG_AUTHPRIV # LOG_MAIL is what most sendmail daemons use
|
||||
|
||||
# The syslog priority at which successful connections are logged.
|
||||
|
||||
@@ -531,7 +531,7 @@
|
||||
# and with Solaris < 2.4. APPEND_DOT will not work with hostnames taken
|
||||
# from /etc/hosts or from NIS maps. It does work with DNS through NIS.
|
||||
#
|
||||
-# DOT= -DAPPEND_DOT
|
||||
+DOT= -DAPPEND_DOT
|
||||
|
||||
##################################################
|
||||
# Optional: Always attempt remote username lookups
|
||||
@@ -610,7 +610,7 @@
|
||||
# Paranoid mode implies hostname lookup. In order to disable hostname
|
||||
# lookups altogether, see the next section.
|
||||
|
||||
-PARANOID= -DPARANOID
|
||||
+PARANOID= #-DPARANOID
|
||||
|
||||
########################################
|
||||
# Optional: turning off hostname lookups
|
||||
@@ -623,7 +623,7 @@
|
||||
# In order to perform selective hostname lookups, disable paranoid
|
||||
# mode (see previous section) and comment out the following definition.
|
||||
|
||||
-HOSTNAME= -DALWAYS_HOSTNAME
|
||||
+HOSTNAME= #-DALWAYS_HOSTNAME
|
||||
|
||||
#############################################
|
||||
# Optional: Turning on host ADDRESS checking
|
||||
@ -1,101 +0,0 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../tcp_wrappers/errno-fix.patch
|
||||
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
||||
# Copyright (C) 1998 - 2003 Clifford Wolf
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
diff -urN tcp_wrappers_7.6-orig/hosts_access.c tcp_wrappers_7.6/hosts_access.c
|
||||
--- tcp_wrappers_7.6-orig/hosts_access.c 1997-02-12 02:13:23.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/hosts_access.c 2003-03-05 16:07:28.000000000 +0100
|
||||
@@ -35,7 +35,7 @@
|
||||
#include <string.h>
|
||||
|
||||
extern char *fgets();
|
||||
-extern int errno;
|
||||
+/*extern int errno;*/
|
||||
|
||||
#ifndef INADDR_NONE
|
||||
#define INADDR_NONE (-1) /* XXX should be 0xffffffff */
|
||||
diff -urN tcp_wrappers_7.6-orig/inetcf.c tcp_wrappers_7.6/inetcf.c
|
||||
--- tcp_wrappers_7.6-orig/inetcf.c 1997-02-12 02:13:24.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/inetcf.c 2003-03-05 16:07:41.000000000 +0100
|
||||
@@ -15,7 +15,7 @@
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
|
||||
-extern int errno;
|
||||
+/*extern int errno;*/
|
||||
extern void exit();
|
||||
|
||||
#include "tcpd.h"
|
||||
diff -urN tcp_wrappers_7.6-orig/percent_m.c tcp_wrappers_7.6/percent_m.c
|
||||
--- tcp_wrappers_7.6-orig/percent_m.c 1994-12-28 17:42:37.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/percent_m.c 2003-03-05 16:07:58.000000000 +0100
|
||||
@@ -12,7 +12,7 @@
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
|
||||
-extern int errno;
|
||||
+/*extern int errno;*/
|
||||
#ifndef SYS_ERRLIST_DEFINED
|
||||
extern char *sys_errlist[];
|
||||
extern int sys_nerr;
|
||||
diff -urN tcp_wrappers_7.6-orig/tcpdchk.c tcp_wrappers_7.6/tcpdchk.c
|
||||
--- tcp_wrappers_7.6-orig/tcpdchk.c 1997-02-12 02:13:25.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/tcpdchk.c 2003-03-05 16:08:14.000000000 +0100
|
||||
@@ -31,7 +31,7 @@
|
||||
#include <netdb.h>
|
||||
#include <string.h>
|
||||
|
||||
-extern int errno;
|
||||
+/*extern int errno;*/
|
||||
extern void exit();
|
||||
extern int optind;
|
||||
extern char *optarg;
|
||||
diff -urN tcp_wrappers_7.6-orig/tli-sequent.c tcp_wrappers_7.6/tli-sequent.c
|
||||
--- tcp_wrappers_7.6-orig/tli-sequent.c 1994-12-28 17:42:51.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/tli-sequent.c 2003-03-05 16:08:32.000000000 +0100
|
||||
@@ -30,7 +30,7 @@
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
|
||||
-extern int errno;
|
||||
+/*extern int errno;*/
|
||||
extern char *sys_errlist[];
|
||||
extern int sys_nerr;
|
||||
extern int t_errno;
|
||||
diff -urN tcp_wrappers_7.6-orig/tli.c tcp_wrappers_7.6/tli.c
|
||||
--- tcp_wrappers_7.6-orig/tli.c 1997-03-21 19:27:26.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/tli.c 2003-03-05 16:08:45.000000000 +0100
|
||||
@@ -39,7 +39,7 @@
|
||||
#include <string.h>
|
||||
|
||||
extern char *nc_sperror();
|
||||
-extern int errno;
|
||||
+/*extern int errno;*/
|
||||
extern char *sys_errlist[];
|
||||
extern int sys_nerr;
|
||||
extern int t_errno;
|
||||
diff -urN tcp_wrappers_7.6-orig/workarounds.c tcp_wrappers_7.6/workarounds.c
|
||||
--- tcp_wrappers_7.6-orig/workarounds.c 1996-03-19 16:22:26.000000000 +0100
|
||||
+++ tcp_wrappers_7.6/workarounds.c 2003-03-05 16:08:59.000000000 +0100
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <syslog.h>
|
||||
#include <string.h>
|
||||
|
||||
-extern int errno;
|
||||
+/*extern int errno;*/
|
||||
|
||||
#include "tcpd.h"
|
||||
|
||||
Loading…
Reference in new issue