Date: Tue, 21 Nov 2000 00:21:21 -0500 (EST) From: Igor Roshchin <str@giganda.komkon.org> To: marquis@roble.com, security@FreeBSD.ORG Subject: Re: FreeBSD Security Advisory: FreeBSD-SA-00:69.telnetd [REVISED] Message-ID: <200011210521.AAA77830@giganda.komkon.org> In-Reply-To: <Pine.BSF.4.21.0011201922460.98706-100000@roble.com>
next in thread | previous in thread | raw e-mail | index | archive | help
No problem on a 4.0-RELEASE box: mailhost: [22:19] [121] /usr/src/libexec/telnetd#patch -p < telnetd.patch.v1.1 Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: ext.h |=================================================================== |RCS file: /home/ncvs/src/libexec/telnetd/ext.h,v |retrieving revision 1.7 |retrieving revision 1.8 |diff -u -r1.7 -r1.8 |--- ext.h 1999/08/28 00:10:22 1.7 |+++ ext.h 2000/11/19 10:01:27 1.8 -------------------------- Patching file ext.h using Plan A... Hunk #1 succeeded at 87. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: sys_term.c |=================================================================== |RCS file: /home/ncvs/src/libexec/telnetd/sys_term.c,v |retrieving revision 1.24 |retrieving revision 1.26 |diff -u -r1.24 -r1.26 |--- sys_term.c 1999/08/28 00:10:24 1.24 |+++ sys_term.c 2000/11/19 10:01:27 1.26 -------------------------- Patching file sys_term.c using Plan A... Hunk #1 succeeded at 480. Hunk #2 succeeded at 1795. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: telnetd.c |=================================================================== |RCS file: /home/ncvs/src/libexec/telnetd/telnetd.c,v |retrieving revision 1.22 |retrieving revision 1.24 |diff -u -r1.22 -r1.24 |--- telnetd.c 2000/01/25 14:52:00 1.22 |+++ telnetd.c 2000/11/19 10:01:27 1.24 -------------------------- Patching file telnetd.c using Plan A... Hunk #1 succeeded at 805. Hunk #2 succeeded at 1114. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: utility.c |=================================================================== |RCS file: /home/ncvs/src/libexec/telnetd/utility.c,v |retrieving revision 1.13 |retrieving revision 1.14 |diff -u -r1.13 -r1.14 |--- utility.c 1999/08/28 00:10:25 1.13 |+++ utility.c 2000/10/31 05:29:54 1.14 -------------------------- Patching file utility.c using Plan A... Hunk #1 succeeded at 330. Hunk #2 succeeded at 343. Hmm... Ignoring the trailing garbage. done Hope, that helps, Igor > Date: Mon, 20 Nov 2000 19:26:53 -0800 (PST) > From: Roger Marquis <marquis@roble.com> > To: security@FreeBSD.ORG > Subject: Re: FreeBSD Security Advisory: FreeBSD-SA-00:69.telnetd [REVISED] > > Anyone have either of these patches run successfully? Here's the > output from patch -p on a 4.1-RELEASE host. > > ---------------------------------------------------------------------- > #patch -p < /tmp/telnetd.patch.v1.1 > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Index: ext.h > |=================================================================== > |RCS file: /home/ncvs/src/libexec/telnetd/ext.h,v > |retrieving revision 1.7 > |retrieving revision 1.8 > |diff -u -r1.7 -r1.8 > |--- ext.h 1999/08/28 00:10:22 1.7 > |+++ ext.h 2000/11/19 10:01:27 1.8 > -------------------------- > Patching file ext.h using Plan A... > Hunk #1 failed at 87. > 1 out of 1 hunks failed--saving rejects to ext.h.rej > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Index: sys_term.c > |=================================================================== > |RCS file: /home/ncvs/src/libexec/telnetd/sys_term.c,v > |retrieving revision 1.24 > |retrieving revision 1.26 > |diff -u -r1.24 -r1.26 > |--- sys_term.c 1999/08/28 00:10:24 1.24 > |+++ sys_term.c 2000/11/19 10:01:27 1.26 > -------------------------- > Patching file sys_term.c using Plan A... > Hunk #1 failed at 480. > Hunk #2 failed at 1795. > 2 out of 2 hunks failed--saving rejects to sys_term.c.rej > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Index: telnetd.c > |=================================================================== > |RCS file: /home/ncvs/src/libexec/telnetd/telnetd.c,v > |retrieving revision 1.22 > |retrieving revision 1.24 > |diff -u -r1.22 -r1.24 > |--- telnetd.c 2000/01/25 14:52:00 1.22 > |+++ telnetd.c 2000/11/19 10:01:27 1.24 > -------------------------- > Patching file telnetd.c using Plan A... > Hunk #1 failed at 805. > Hunk #2 failed at 1114. > 2 out of 2 hunks failed--saving rejects to telnetd.c.rej > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Index: utility.c > |=================================================================== > |RCS file: /home/ncvs/src/libexec/telnetd/utility.c,v > |retrieving revision 1.13 > |retrieving revision 1.14 > |diff -u -r1.13 -r1.14 > |--- utility.c 1999/08/28 00:10:25 1.13 > |+++ utility.c 2000/10/31 05:29:54 1.14 > -------------------------- > Patching file utility.c using Plan A... > Hunk #1 failed at 330. > Hunk #2 failed at 343. > 2 out of 2 hunks failed--saving rejects to utility.c.rej > Hmm... Ignoring the trailing garbage. > done > ----------------------------------------------------------------------o > > -- > Roger Marquis > Roble Systems Consulting > http://www.roble.com/ > > > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-security" in the body of the message > > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-security" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200011210521.AAA77830>