SOURCES: tcp_wrappers-fix.patch - removed dead meat - split random...
baggins
baggins at pld-linux.org
Sat Jul 7 02:53:27 CEST 2007
Author: baggins Date: Sat Jul 7 00:53:27 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- removed dead meat
- split random fixes into separate patches
- merged some hunks with tcp_wrappers-alarm.patch
---- Files affected:
SOURCES:
tcp_wrappers-fix.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/tcp_wrappers-fix.patch
diff -u SOURCES/tcp_wrappers-fix.patch:1.1 SOURCES/tcp_wrappers-fix.patch:1.2
--- SOURCES/tcp_wrappers-fix.patch:1.1 Wed Dec 22 00:12:40 1999
+++ SOURCES/tcp_wrappers-fix.patch Sat Jul 7 02:53:21 2007
@@ -183,150 +183,3 @@
# Enable all bells and whistles for linting.
-diff -urN tcp_wrappers_7.6.orig/README tcp_wrappers_7.6/README
---- tcp_wrappers_7.6.orig/README Mon Dec 13 13:58:15 1999
-+++ tcp_wrappers_7.6/README Mon Dec 13 14:09:31 1999
-@@ -169,7 +169,7 @@
- 2) The advanced way: leave the network daemons alone and modify the
- inetd configuration file. For example, an entry such as:
-
-- tftp dgram udp wait root /usr/etc/tcpd in.tftpd -s /tftpboot
-+ tftp dgram udp wait root /usr/sbin/tcpd in.tftpd -s /tftpboot
-
- When a tftp request arrives, inetd will run the wrapper program
- (tcpd) with a process name `in.tftpd'. This is the name that the
-@@ -821,12 +821,12 @@
- Then perform the following edits on the inetd configuration file
- (usually /etc/inetd.conf or /etc/inet/inetd.conf):
-
-- finger stream tcp nowait nobody /usr/etc/in.fingerd in.fingerd
-- ^^^^^^^^^^^^^^^^^^^
-+ finger stream tcp nowait nobody /usr/sbin/in.fingerd in.fingerd
-+ ^^^^^^^^^^^^^^^^^^^^
- becomes:
-
-- finger stream tcp nowait nobody /usr/etc/tcpd in.fingerd
-- ^^^^^^^^^^^^^
-+ finger stream tcp nowait nobody /usr/sbin/tcpd in.fingerd
-+ ^^^^^^^^^^^^^^
- Send a `kill -HUP' to the inetd process to make the change effective.
- Some IRIX inetd implementations require that you first disable the
- finger service (comment out the finger service and `kill -HUP' the
-@@ -873,7 +873,7 @@
- Instead you can specify, in the inetd configuration file, an absolute
- path name for the daemon process name. For example,
-
-- ntalk dgram udp wait root /usr/etc/tcpd /usr/local/lib/ntalkd
-+ ntalk dgram udp wait root /usr/sbin/tcpd /usr/sbin/in.ntalkd
-
- When the daemon process name is an absolute path name, tcpd ignores the
- value of the REAL_DAEMON_DIR constant, and uses the last path component
-@@ -940,7 +940,7 @@
- you can look up the name from the inetd configuration file. Coming back
- to the tftp example in the tutorial section above:
-
-- tftp dgram udp wait root /usr/etc/tcpd in.tftpd -s /tftpboot
-+ tftp dgram udp wait root /usr/sbin/tcpd in.tftpd -s /tftpboot
-
- This entry causes the inetd to run the wrapper program (tcpd) with a
- process name `in.tftpd'. This is the name that the wrapper will use
-@@ -976,7 +976,7 @@
- listener, but it should be registered in the inetd configuration file.
- For example:
-
-- smtp stream tcp nowait root /usr/etc/tcpd /usr/lib/sendmail -bs
-+ smtp stream tcp nowait root /usr/sbin/tcpd /usr/lib/sendmail -bs
-
- You will still need to run one sendmail background process to handle
- queued-up outgoing mail. A command like:
-diff -urN tcp_wrappers_7.6.orig/fix_options.c tcp_wrappers_7.6/fix_options.c
---- tcp_wrappers_7.6.orig/fix_options.c Mon Dec 13 13:58:15 1999
-+++ tcp_wrappers_7.6/fix_options.c Mon Dec 13 14:09:18 1999
-@@ -38,7 +38,12 @@
- #ifdef IP_OPTIONS
- unsigned char optbuf[BUFFER_SIZE / 3], *cp;
- char lbuf[BUFFER_SIZE], *lp;
-+#if !defined(__GLIBC__)
- int optsize = sizeof(optbuf), ipproto;
-+#else
-+ size_t optsize = sizeof(optbuf);
-+ int ipproto;
-+#endif
- struct protoent *ip;
- int fd = request->fd;
- unsigned int opt;
-diff -urN tcp_wrappers_7.6.orig/rfc931.c tcp_wrappers_7.6/rfc931.c
---- tcp_wrappers_7.6.orig/rfc931.c Mon Dec 13 13:58:15 1999
-+++ tcp_wrappers_7.6/rfc931.c Mon Dec 13 14:09:18 1999
-@@ -33,7 +33,7 @@
-
- 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 @@
- static void timeout(sig)
- int sig;
- {
-- longjmp(timebuf, sig);
-+ siglongjmp(timebuf, sig);
- }
-
- /* rfc931 - return remote user name, given socket structures */
-@@ -133,7 +133,7 @@
- * Set up a timer so we won't get stuck while waiting for the server.
- */
-
-- if (setjmp(timebuf) == 0) {
-+ if (sigsetjmp(timebuf,1) == 0) {
- signal(SIGALRM, timeout);
- alarm(rfc931_timeout);
-
-diff -urN tcp_wrappers_7.6.orig/safe_finger.c tcp_wrappers_7.6/safe_finger.c
---- tcp_wrappers_7.6.orig/safe_finger.c Mon Dec 13 13:58:15 1999
-+++ tcp_wrappers_7.6/safe_finger.c Mon Dec 13 14:15:09 1999
-@@ -31,14 +31,14 @@
-
- /* 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 99 /* Default uid and gid */
-
- int finger_pid;
-
-@@ -48,6 +48,9 @@
- kill(finger_pid, SIGKILL);
- exit(0);
- }
-+
-+int allow_severity; /* for connection logging */
-+int deny_severity; /* for connection logging */
-
- main(argc, argv)
- int argc;
-diff -urN tcp_wrappers_7.6.orig/workarounds.c tcp_wrappers_7.6/workarounds.c
---- tcp_wrappers_7.6.orig/workarounds.c Mon Dec 13 13:58:15 1999
-+++ tcp_wrappers_7.6/workarounds.c Mon Dec 13 14:09:18 1999
-@@ -163,7 +163,11 @@
- int fix_getpeername(sock, sa, len)
- int sock;
- struct sockaddr *sa;
-+#if !defined(__GLIBC__)
- int *len;
-+#else
-+size_t *len;
-+#endif
- {
- int ret;
- #ifdef INET6
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/tcp_wrappers-fix.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list