From owner-cvs-sbin Tue Dec 31 16:05:32 1996 Return-Path: Received: (from root@localhost) by freefall.freebsd.org (8.8.4/8.8.4) id QAA03205 for cvs-sbin-outgoing; Tue, 31 Dec 1996 16:05:32 -0800 (PST) Received: (from imp@localhost) by freefall.freebsd.org (8.8.4/8.8.4) id QAA03192; Tue, 31 Dec 1996 16:05:29 -0800 (PST) Date: Tue, 31 Dec 1996 16:05:29 -0800 (PST) From: Warner Losh Message-Id: <199701010005.QAA03192@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-sbin Subject: cvs commit: src/sbin/restore dirs.c main.c tape.c Sender: owner-cvs-sbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk imp 96/12/31 16:05:28 Branch: sbin/restore RELENG_2_2 Modified: sbin/restore dirs.c main.c tape.c Log: Merge into 2.2, per jordan. Various security related deltas from OpenBSD dirs.c: From OpenBSD 1.2, 1.3, 1.5, 1.8, 1.10, 1.11, 1.12 1.2: use unique temporary files; netbsd pr#2544; lukem@supp.cpr.itg.telecom.com.au 1.3: updated patch from lukem@supp.cpr.itg.telecom.com.au to also make -r and -R work again 1.5: mktemp open & fdopen 1.8: /tmp// -> /tmp/ 1.10: Fix strncpy usage and correct strncat length field, from Theo. Also change some occurrence of MAXPATHLEN with sizeof(foo). 1.11: does noone know how to use strncat correctly? 1.12: use mkstemp() From NetBSD: Use open rather than create so we can specify exclusive open mode. main.c: From OpenBSD 1.2, 1.5 1.2: From NetBSD: support $TAPE. 1.5 Set umask to be read only by owner until we set real file permissions. tape.c: From NetBSD: Use open rather than create so we can specify exclusive open mode. Revision Changes Path 1.6.2.1 +35 -15 src/sbin/restore/dirs.c 1.2.2.1 +6 -1 src/sbin/restore/main.c 1.4.2.1 +2 -1 src/sbin/restore/tape.c