Date: Sun, 16 Nov 2003 21:59:35 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 42628 for review Message-ID: <200311170559.hAH5xZFu073629@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=42628 Change 42628 by peter@peter_overcee on 2003/11/16 21:59:23 IFC @42624 (for real this time, I dont know what happened last time) Affected files ... .. //depot/projects/hammer/gnu/usr.bin/gzip/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/tar/Makefile#2 integrate .. //depot/projects/hammer/lib/libc/Makefile#9 integrate .. //depot/projects/hammer/lib/libc/stdtime/strptime.c#7 integrate .. //depot/projects/hammer/sbin/dumpfs/dumpfs.c#9 integrate .. //depot/projects/hammer/sbin/nologin/nologin.8#2 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#15 integrate .. //depot/projects/hammer/usr.bin/bzip2/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#10 integrate Differences ... ==== //depot/projects/hammer/gnu/usr.bin/gzip/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 5.3 (Berkeley) 5/12/90 -# $FreeBSD: src/gnu/usr.bin/gzip/Makefile,v 1.24 2002/09/17 01:48:49 peter Exp $ +# $FreeBSD: src/gnu/usr.bin/gzip/Makefile,v 1.25 2003/11/17 05:18:36 obrien Exp $ PROG= gzip SRCS= gzip.c zip.c deflate.c trees.c bits.c unzip.c inflate.c util.c \ @@ -12,8 +12,6 @@ SCRIPTS=gzexe zdiff zforce zmore znew MAN= gzexe.1 gzip.1 zdiff.1 zforce.1 zmore.1 znew.1 -NOSHARED?=yes - LINKS+= ${BINDIR}/gzip ${BINDIR}/gunzip LINKS+= ${BINDIR}/gzip ${BINDIR}/gzcat LINKS+= ${BINDIR}/gzip ${BINDIR}/zcat ==== //depot/projects/hammer/gnu/usr.bin/tar/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/tar/Makefile,v 1.17 2002/06/05 07:00:41 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/tar/Makefile,v 1.18 2003/11/17 05:16:26 obrien Exp $ TARDIR= ${.CURDIR}/../../../contrib/tar .PATH: ${TARDIR}/lib ${TARDIR}/src @@ -18,6 +18,4 @@ CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR} -I${TARDIR}/lib -I${TARDIR}/src -NOSHARED?= YES - .include <bsd.prog.mk> ==== //depot/projects/hammer/lib/libc/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $FreeBSD: src/lib/libc/Makefile,v 1.44 2003/08/19 23:01:46 wollman Exp $ +# $FreeBSD: src/lib/libc/Makefile,v 1.45 2003/11/17 04:20:02 nectar Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -12,6 +12,7 @@ # If you bump SHLIB_MAJOR, remove kluge from gen/gethostname.c. SHLIB_MAJOR= 5 SHLIBDIR?= /lib +WARNS?= 1 CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include CFLAGS+=-I${.CURDIR}/${MACHINE_ARCH} CLEANFILES+=tags ==== //depot/projects/hammer/lib/libc/stdtime/strptime.c#7 (text+ko) ==== @@ -59,12 +59,12 @@ static char sccsid[] __unused = "@(#)strptime.c 0.1 (Powerdog) 94/03/27"; #endif /* !defined NOID */ #endif /* not lint */ -__FBSDID("$FreeBSD: src/lib/libc/stdtime/strptime.c,v 1.34 2003/04/30 10:25:57 mtm Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdtime/strptime.c,v 1.35 2003/11/17 04:19:15 nectar Exp $"); #include "namespace.h" #include <time.h> #include <ctype.h> -#include <limits.h> +#include <errno.h> #include <stdlib.h> #include <string.h> #include <pthread.h> @@ -444,11 +444,18 @@ case 's': { char *cp; + int sverrno; + long n; time_t t; - t = strtol(buf, &cp, 10); - if (t == LONG_MAX) + sverrno = errno; + errno = 0; + n = strtol(buf, &cp, 10); + if (errno == ERANGE || (long)(t = n) != n) { + errno = sverrno; return 0; + } + errno = sverrno; buf = cp; gmtime_r(&t, tm); *GMTp = 1; ==== //depot/projects/hammer/sbin/dumpfs/dumpfs.c#9 (text+ko) ==== @@ -51,7 +51,7 @@ static char sccsid[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dumpfs/dumpfs.c,v 1.38 2003/11/14 13:13:23 johan Exp $"; + "$FreeBSD: src/sbin/dumpfs/dumpfs.c,v 1.39 2003/11/17 01:22:07 truckman Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -211,6 +211,8 @@ afs.fs_sblkno, afs.fs_cblkno, afs.fs_iblkno, afs.fs_dblkno); printf("cgrotor\t%d\tfmod\t%d\tronly\t%d\tclean\t%d\n", afs.fs_cgrotor, afs.fs_fmod, afs.fs_ronly, afs.fs_clean); + printf("avgfilesize %d\tavgfpdir %d\n", + afs.fs_avgfilesize, afs.fs_avgfpdir); printf("flags\t"); if (afs.fs_old_flags & FS_FLAGS_UPDATED) fsflags = afs.fs_flags; ==== //depot/projects/hammer/sbin/nologin/nologin.8#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)nologin.8 8.1 (Berkeley) 6/19/93 -.\" $FreeBSD: src/sbin/nologin/nologin.8,v 1.10 2002/07/06 19:34:10 charnier Exp $ +.\" $FreeBSD: src/sbin/nologin/nologin.8,v 1.11 2003/11/17 00:08:28 das Exp $ .\" .Dd June 19, 1993 .Dt NOLOGIN 8 @@ -59,3 +59,18 @@ .Nm utility appeared in .Bx 4.4 . +.Sh BUGS +Login mechanisms that allow users to specify the initial environment, +such as +.Xr login 1 +and +.Xr sshd 8 , +can be used to bypass +.Nm . +To avoid this possibility, you must use a different lockout mechanism +such as +.Xr login.conf 5 +or compile a statically-linked +.Xr sh 1 +as described in +.Xr make.conf 5 . ==== //depot/projects/hammer/share/man/man5/make.conf.5#15 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.80 2003/09/24 04:19:26 gshapiro Exp $ +.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.81 2003/11/16 22:15:09 simon Exp $ .\" .Dd November 3, 2000 .Dt MAKE.CONF 5 @@ -421,6 +421,13 @@ It is .Em "YOUR RESPONSIBILITY" to determine if you can legally use IDEA. +.It Va NO_DYNAMICROOT +.Pq Vt bool +Set this if you do not want to link +.Pa /bin +and +.Pa /sbin +dynamically. .It Va NO_KERBEROS .Pq Vt bool Set this if you do not want to build Kerberos 5 (KTH Heimdal). ==== //depot/projects/hammer/usr.bin/bzip2/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/usr.bin/bzip2/Makefile,v 1.6 2003/06/14 19:32:52 obrien Exp $ +# $FreeBSD: src/usr.bin/bzip2/Makefile,v 1.7 2003/11/17 05:19:37 obrien Exp $ BZ2DIR= ${.CURDIR}/../../contrib/bzip2 .PATH: ${BZ2DIR} @@ -12,8 +12,6 @@ DPADD= ${LIBBZ2} LDADD= -lbz2 -NOSHARED?= YES - LINKS= ${BINDIR}/bzip2 ${BINDIR}/bunzip2 LINKS+= ${BINDIR}/bzip2 ${BINDIR}/bzcat MLINKS= bzip2.1 bunzip2.1 bzip2.1 bzcat.1 ==== //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#10 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/usr.sbin/syslogd/syslogd.c,v 1.116 2003/05/17 20:07:54 gshapiro Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/syslogd/syslogd.c,v 1.118 2003/11/16 21:51:06 dwmalone Exp $"); /* * syslogd -- log system messages @@ -1111,7 +1111,7 @@ /* case ENOBUFS: */ /* case ECONNREFUSED: */ default: - dprintf("removing entry\n", e); + dprintf("removing entry\n"); (void)close(f->f_file); f->f_type = F_UNUSED; break; @@ -1338,7 +1338,12 @@ logerror(const char *type) { char buf[512]; + static int recursed = 0; + /* If there's an error while trying to log an error, give up. */ + if (recursed) + return; + recursed++; if (errno) (void)snprintf(buf, sizeof buf, "syslogd: %s: %s", type, strerror(errno)); @@ -1347,6 +1352,7 @@ errno = 0; dprintf("%s\n", buf); logmsg(LOG_SYSLOG|LOG_ERR, buf, LocalHostName, ADDDATE); + recursed--; } static void
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311170559.hAH5xZFu073629>