From owner-p4-projects@FreeBSD.ORG Wed Jan 13 19:44:16 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E3151065695; Wed, 13 Jan 2010 19:44:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 31CA31065692 for ; Wed, 13 Jan 2010 19:44:16 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1DDDD8FC16 for ; Wed, 13 Jan 2010 19:44:16 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0DJiGOG008090 for ; Wed, 13 Jan 2010 19:44:16 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0DJi9bx008084 for perforce@freebsd.org; Wed, 13 Jan 2010 19:44:09 GMT (envelope-from peter@wemm.org) Date: Wed, 13 Jan 2010 19:44:09 GMT Message-Id: <201001131944.o0DJi9bx008084@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 173075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2010 19:44:16 -0000 http://p4web.freebsd.org/chv.cgi?CH=173075 Change 173075 by peter@peter_daintree on 2010/01/13 19:43:16 IFC @173074 Affected files ... .. //depot/projects/hammer/ObsoleteFiles.inc#76 integrate .. //depot/projects/hammer/UPDATING#141 integrate .. //depot/projects/hammer/bin/csh/config.h#10 integrate .. //depot/projects/hammer/bin/csh/config_p.h#5 integrate .. //depot/projects/hammer/bin/date/Makefile#4 integrate .. //depot/projects/hammer/bin/date/date.c#10 integrate .. //depot/projects/hammer/bin/pax/gen_subs.c#5 integrate .. //depot/projects/hammer/contrib/telnet/telnetd/sys_term.c#5 integrate .. //depot/projects/hammer/contrib/telnet/telnetd/telnetd.c#7 integrate .. //depot/projects/hammer/crypto/openssh/config.h#18 integrate .. //depot/projects/hammer/crypto/openssh/defines.h#15 integrate .. //depot/projects/hammer/crypto/openssh/loginrec.c#16 integrate .. //depot/projects/hammer/crypto/openssh/sshd.c#20 integrate .. //depot/projects/hammer/etc/newsyslog.conf#13 integrate .. //depot/projects/hammer/etc/periodic/monthly/200.accounting#3 integrate .. //depot/projects/hammer/etc/rc.d/cleanvar#13 integrate .. //depot/projects/hammer/etc/rc.d/var#10 integrate .. //depot/projects/hammer/games/fortune/datfiles/freebsd-tips#19 integrate .. //depot/projects/hammer/include/Makefile#84 integrate .. //depot/projects/hammer/include/utmp.h#3 integrate .. //depot/projects/hammer/include/utmpx.h#1 branch .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#45 integrate .. //depot/projects/hammer/lib/libc/gen/Symbol.map#19 integrate .. //depot/projects/hammer/lib/libc/gen/getutxent.3#1 branch .. //depot/projects/hammer/lib/libc/gen/getutxent.c#1 branch .. //depot/projects/hammer/lib/libc/gen/pututxline.c#1 branch .. //depot/projects/hammer/lib/libc/gen/sem_init.3#6 integrate .. //depot/projects/hammer/lib/libc/gen/sem_new.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/sem_open.3#5 integrate .. //depot/projects/hammer/lib/libc/gen/utxdb.c#1 branch .. //depot/projects/hammer/lib/libc/gen/utxdb.h#1 branch .. //depot/projects/hammer/lib/libc/net/sctp_bindx.3#3 integrate .. //depot/projects/hammer/lib/libc/net/sctp_connectx.3#4 integrate .. //depot/projects/hammer/lib/libc/net/sctp_getaddrlen.3#3 integrate .. //depot/projects/hammer/lib/libc/net/sctp_getassocid.3#3 integrate .. //depot/projects/hammer/lib/libc/net/sctp_getpaddrs.3#3 integrate .. //depot/projects/hammer/lib/libc/net/sctp_opt_info.3#4 integrate .. //depot/projects/hammer/lib/libc/net/sctp_recvmsg.3#4 integrate .. //depot/projects/hammer/lib/libc/net/sctp_send.3#5 integrate .. //depot/projects/hammer/lib/libc/net/sctp_sendmsg.3#5 integrate .. //depot/projects/hammer/lib/libc/sys/sctp_generic_recvmsg.2#5 integrate .. //depot/projects/hammer/lib/libc/sys/sctp_generic_sendmsg.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/sctp_peeloff.2#5 integrate .. //depot/projects/hammer/lib/libelf/elf.3#4 integrate .. //depot/projects/hammer/lib/libopie/Makefile#13 integrate .. //depot/projects/hammer/lib/libopie/config.h#2 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_lastlog/pam_lastlog.c#11 integrate .. //depot/projects/hammer/lib/libpmc/libpmc.c#18 integrate .. //depot/projects/hammer/lib/libulog/Makefile#3 integrate .. //depot/projects/hammer/lib/libulog/Symbol.map#2 integrate .. //depot/projects/hammer/lib/libulog/ulog.h#3 integrate .. //depot/projects/hammer/lib/libulog/ulog_getutxent.3#2 delete .. //depot/projects/hammer/lib/libulog/ulog_getutxent.c#3 delete .. //depot/projects/hammer/lib/libulog/ulog_internal.h#2 delete .. //depot/projects/hammer/lib/libulog/ulog_login.3#2 integrate .. //depot/projects/hammer/lib/libulog/ulog_login.c#2 integrate .. //depot/projects/hammer/lib/libulog/ulog_login_pseudo.c#2 integrate .. //depot/projects/hammer/lib/libulog/ulog_pututxline.c#3 delete .. //depot/projects/hammer/lib/libulog/ulog_setutxfile.3#3 delete .. //depot/projects/hammer/lib/libulog/ulog_util.c#2 delete .. //depot/projects/hammer/lib/libulog/utempter.c#2 integrate .. //depot/projects/hammer/lib/libulog/utempter_add_record.3#2 integrate .. //depot/projects/hammer/lib/libutil/Makefile#25 integrate .. //depot/projects/hammer/lib/libutil/libutil.h#14 integrate .. //depot/projects/hammer/lib/libutil/login.3#3 delete .. //depot/projects/hammer/lib/libutil/login.c#4 delete .. //depot/projects/hammer/lib/libutil/logout.3#4 delete .. //depot/projects/hammer/lib/libutil/logout.c#6 delete .. //depot/projects/hammer/lib/libutil/logwtmp.3#2 delete .. //depot/projects/hammer/lib/libutil/logwtmp.c#7 delete .. //depot/projects/hammer/libexec/comsat/comsat.c#5 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#34 integrate .. //depot/projects/hammer/libexec/ftpd/logwtmp.c#4 integrate .. //depot/projects/hammer/libexec/rlogind/rlogind.c#5 integrate .. //depot/projects/hammer/libexec/rpc.rusersd/Makefile#4 integrate .. //depot/projects/hammer/libexec/rpc.rusersd/rusers_proc.c#4 integrate .. //depot/projects/hammer/libexec/talkd/Makefile#4 integrate .. //depot/projects/hammer/libexec/talkd/process.c#4 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass2.c#10 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#44 integrate .. //depot/projects/hammer/sbin/init/Makefile#11 integrate .. //depot/projects/hammer/sbin/init/init.c#16 integrate .. //depot/projects/hammer/sbin/reboot/Makefile#8 integrate .. //depot/projects/hammer/sbin/reboot/reboot.c#13 integrate .. //depot/projects/hammer/share/man/man3/pthread_affinity_np.3#2 integrate .. //depot/projects/hammer/share/man/man3/pthread_attr_affinity_np.3#2 integrate .. //depot/projects/hammer/share/man/man4/Makefile#126 integrate .. //depot/projects/hammer/share/man/man4/ath.4#40 integrate .. //depot/projects/hammer/share/man/man4/cpufreq.4#14 integrate .. //depot/projects/hammer/share/man/man4/snd_hda.4#17 integrate .. //depot/projects/hammer/share/man/man4/uhso.4#1 branch .. //depot/projects/hammer/share/man/man4/vge.4#9 integrate .. //depot/projects/hammer/share/man/man5/Makefile#27 integrate .. //depot/projects/hammer/share/man/man5/utmp.5#5 delete .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#90 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#51 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#9 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#63 integrate .. //depot/projects/hammer/sys/compat/linux/linux_uid16.c#16 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#37 integrate .. //depot/projects/hammer/sys/conf/NOTES#169 integrate .. //depot/projects/hammer/sys/conf/files#207 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_pci.c#22 integrate .. //depot/projects/hammer/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#3 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#77 integrate .. //depot/projects/hammer/sys/dev/ct/ct_isa.c#12 integrate .. //depot/projects/hammer/sys/dev/mly/mly.c#22 integrate .. //depot/projects/hammer/sys/dev/mxge/eth_z8e.h#7 integrate .. //depot/projects/hammer/sys/dev/mxge/ethp_z8e.h#7 integrate .. //depot/projects/hammer/sys/dev/mxge/if_mxge.c#26 integrate .. //depot/projects/hammer/sys/dev/mxge/rss_eth_z8e.h#5 integrate .. //depot/projects/hammer/sys/dev/mxge/rss_ethp_z8e.h#5 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#37 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac_private.h#10 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#40 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/mixer.c#29 integrate .. //depot/projects/hammer/sys/dev/usb/net/uhso.c#1 branch .. //depot/projects/hammer/sys/dev/usb/usbdevs#127 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs.h#13 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#17 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#47 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#24 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#50 integrate .. //depot/projects/hammer/sys/kern/kern_mib.c#30 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#39 integrate .. //depot/projects/hammer/sys/kern/subr_param.c#25 integrate .. //depot/projects/hammer/sys/mips/conf/AR71XX#2 integrate .. //depot/projects/hammer/sys/mips/conf/MALTA64#2 integrate .. //depot/projects/hammer/sys/mips/conf/SWARM#2 integrate .. //depot/projects/hammer/sys/mips/rmi/ehcireg.h#2 integrate .. //depot/projects/hammer/sys/mips/rmi/ehcivar.h#2 integrate .. //depot/projects/hammer/sys/mips/rmi/pcibus.c#2 integrate .. //depot/projects/hammer/sys/mips/rmi/pcibus.h#2 integrate .. //depot/projects/hammer/sys/mips/rmi/uart_bus_xlr_iodi.c#2 integrate .. //depot/projects/hammer/sys/mips/rmi/xlr_i2c.c#2 integrate .. //depot/projects/hammer/sys/mips/rmi/xls_ehci.c#2 integrate .. //depot/projects/hammer/sys/modules/usb/Makefile#16 integrate .. //depot/projects/hammer/sys/modules/usb/uhso/Makefile#1 branch .. //depot/projects/hammer/sys/net80211/ieee80211_mesh.c#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_mesh.h#3 integrate .. //depot/projects/hammer/sys/rpc/authunix_prot.c#8 integrate .. //depot/projects/hammer/sys/security/audit/audit_arg.c#21 integrate .. //depot/projects/hammer/sys/sys/param.h#137 integrate .. //depot/projects/hammer/sys/sys/systm.h#66 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#40 integrate .. //depot/projects/hammer/tools/tools/ath/athdecode/main.c#2 integrate .. //depot/projects/hammer/usr.bin/finger/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/finger/finger.c#10 integrate .. //depot/projects/hammer/usr.bin/finger/lprint.c#7 integrate .. //depot/projects/hammer/usr.bin/finger/net.c#8 integrate .. //depot/projects/hammer/usr.bin/finger/sprint.c#6 integrate .. //depot/projects/hammer/usr.bin/finger/util.c#7 integrate .. //depot/projects/hammer/usr.bin/getent/getent.1#3 integrate .. //depot/projects/hammer/usr.bin/getent/getent.c#3 integrate .. //depot/projects/hammer/usr.bin/last/last.c#7 integrate .. //depot/projects/hammer/usr.bin/systat/Makefile#9 integrate .. //depot/projects/hammer/usr.bin/systat/vmstat.c#14 integrate .. //depot/projects/hammer/usr.bin/users/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/users/users.c#4 integrate .. //depot/projects/hammer/usr.bin/w/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/w/w.c#11 integrate .. //depot/projects/hammer/usr.bin/wall/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/wall/wall.c#7 integrate .. //depot/projects/hammer/usr.bin/who/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/who/who.c#9 integrate .. //depot/projects/hammer/usr.bin/write/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/write/write.c#6 integrate .. //depot/projects/hammer/usr.sbin/Makefile#105 integrate .. //depot/projects/hammer/usr.sbin/ac/ac.c#5 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#3 integrate .. //depot/projects/hammer/usr.sbin/lastlogin/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/lastlogin/lastlogin.c#4 integrate .. //depot/projects/hammer/usr.sbin/ppp/id.c#2 integrate .. //depot/projects/hammer/usr.sbin/ppp/id.h#3 integrate .. //depot/projects/hammer/usr.sbin/ppp/physical.c#11 integrate .. //depot/projects/hammer/usr.sbin/ppp/physical.h#5 integrate .. //depot/projects/hammer/usr.sbin/rwhod/Makefile#5 integrate .. //depot/projects/hammer/usr.sbin/rwhod/rwhod.c#8 integrate .. //depot/projects/hammer/usr.sbin/syslogd/Makefile#8 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#40 integrate .. //depot/projects/hammer/usr.sbin/timed/timed/master.c#3 integrate .. //depot/projects/hammer/usr.sbin/timed/timed/slave.c#3 integrate .. //depot/projects/hammer/usr.sbin/uhsoctl/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/uhsoctl/uhsoctl.1#1 branch .. //depot/projects/hammer/usr.sbin/uhsoctl/uhsoctl.c#1 branch Differences ... ==== //depot/projects/hammer/ObsoleteFiles.inc#76 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.218 2010/01/05 02:37:59 davidxu Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.221 2010/01/13 19:03:48 ed Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,21 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100113: remove utmp.h, replace it by utmpx.h +OLD_FILES+=usr/share/man/man3/login.3.gz +OLD_FILES+=usr/share/man/man3/logout.3.gz +OLD_FILES+=usr/share/man/man3/logwtmp.3.gz +OLD_FILES+=usr/share/man/man3/ulog_endutxent.3.gz +OLD_FILES+=usr/share/man/man3/ulog_getutxent.3.gz +OLD_FILES+=usr/share/man/man3/ulog_getutxline.3.gz +OLD_FILES+=usr/share/man/man3/ulog_getutxuser.3.gz +OLD_FILES+=usr/share/man/man3/ulog_pututxline.3.gz +OLD_FILES+=usr/share/man/man3/ulog_setutxent.3.gz +OLD_FILES+=usr/share/man/man3/ulog_setutxfile.3.gz +OLD_FILES+=usr/share/man/man5/lastlog.5.gz +OLD_FILES+=usr/share/man/man5/utmp.5.gz +OLD_FILES+=usr/share/man/man5/wtmp.5.gz +OLD_LIBS+=lib/libutil.so.8 # 20100105: new userland semaphore implementation OLD_FILES+=usr/include/sys/semaphore.h # 20100103: ntptrace(8) removed ==== //depot/projects/hammer/UPDATING#141 (text+ko) ==== @@ -22,6 +22,23 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20100113: + The utmp user accounting database has been replaced with utmpx, + the user accounting interface standardized by POSIX. + Unfortunately the semantics of utmp and utmpx don't match, + making it practically impossible to support both interfaces. + The user accounting database is used by tools like finger(1), + last(1), talk(1), w(1) and ac(8). + + All applications in the base system use utmpx. This means only + local binaries (e.g. from the ports tree) may still use these + utmp database files. These applications must be rebuilt to make + use of utmpx. + + After the system has been upgraded, it is safe to remove the old + log files (/var/run/utmp, /var/log/lastlog and /var/log/wtmp*), + assuming their contents is of no importance anymore. + 20100108: Introduce the kernel thread "deadlock resolver" (which can be enabled via the DEADLKRES option, see NOTES for more details) and the @@ -1094,4 +1111,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.651 2010/01/09 01:46:38 attilio Exp $ +$FreeBSD: src/UPDATING,v 1.652 2010/01/13 19:25:03 ed Exp $ ==== //depot/projects/hammer/bin/csh/config.h#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/bin/csh/config.h,v 1.15 2007/05/16 21:22:38 mp Exp $ */ +/* $FreeBSD: src/bin/csh/config.h,v 1.16 2010/01/13 17:49:35 ed Exp $ */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ @@ -54,7 +54,7 @@ #define HAVE_GETPWENT 1 /* Define to 1 if you have the `getutent' function. */ -/* #undef HAVE_GETUTENT */ +#define HAVE_GETUTENT 1 /* Define if you have the iconv() function. */ /* #undef HAVE_ICONV */ @@ -130,10 +130,10 @@ #define HAVE_STRUCT_UTMP_UT_HOST 1 /* Define to 1 if `ut_tv' is member of `struct utmp'. */ -/* #undef HAVE_STRUCT_UTMP_UT_TV */ +#define HAVE_STRUCT_UTMP_UT_TV 1 /* Define to 1 if `ut_user' is member of `struct utmp'. */ -/* #undef HAVE_STRUCT_UTMP_UT_USER */ +#define HAVE_STRUCT_UTMP_UT_USER 1 /* Define to 1 if `ut_xtime' is member of `struct utmp'. */ /* #undef HAVE_STRUCT_UTMP_UT_XTIME */ @@ -159,10 +159,10 @@ #define HAVE_UNISTD_H 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_UTMPX_H */ +#define HAVE_UTMPX_H 1 /* Define to 1 if you have the header file. */ -#define HAVE_UTMP_H 1 +/* #undef HAVE_UTMP_H */ /* Define to 1 if you have the header file. */ #define HAVE_WCHAR_H 1 ==== //depot/projects/hammer/bin/csh/config_p.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/bin/csh/config_p.h,v 1.14 2007/05/16 21:22:38 mp Exp $ */ +/* $FreeBSD: src/bin/csh/config_p.h,v 1.15 2010/01/13 17:49:35 ed Exp $ */ /* * config.h -- configure various defines for tcsh * @@ -85,6 +85,7 @@ /* Use LC_MESSAGES locale category to open the message catalog */ #define MCLoadBySet NL_CAT_LOCALE #define BUFSIZE 8192 +#define UTMPX_FILE "/var/run/utx.active" #endif #if defined(__bsdi__) ==== //depot/projects/hammer/bin/date/Makefile#4 (text+ko) ==== @@ -1,9 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/date/Makefile,v 1.12 2009/12/05 20:09:50 ed Exp $ +# $FreeBSD: src/bin/date/Makefile,v 1.13 2010/01/13 17:56:54 ed Exp $ PROG= date SRCS= date.c netdate.c vary.c -DPADD= ${LIBULOG} -LDADD= -lulog .include ==== //depot/projects/hammer/bin/date/date.c#10 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.49 2009/12/05 20:09:50 ed Exp $"); +__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.50 2010/01/13 17:56:54 ed Exp $"); #include #include @@ -52,9 +52,8 @@ #include #include #include -#define _ULOG_POSIX_NAMES -#include #include +#include #include "extern.h" #include "vary.h" ==== //depot/projects/hammer/bin/pax/gen_subs.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/gen_subs.c,v 1.23 2004/04/06 20:06:48 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/gen_subs.c,v 1.24 2010/01/13 17:56:54 ed Exp $"); #include #include @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include @@ -66,10 +65,6 @@ #define OLDFRMTM "%b %e %Y" #define CURFRMTD "%e %b %H:%M" #define OLDFRMTD "%e %b %Y" -#ifndef UT_NAMESIZE -#define UT_NAMESIZE 8 -#endif -#define UT_GRPSIZE 6 static int d_first = -1; @@ -116,9 +111,8 @@ */ if (strftime(f_date,DATELEN,timefrmt,localtime(&(sbp->st_mtime))) == 0) f_date[0] = '\0'; - (void)fprintf(fp, "%s%2u %-*s %-*s ", f_mode, sbp->st_nlink, - UT_NAMESIZE, name_uid(sbp->st_uid, 1), UT_GRPSIZE, - name_gid(sbp->st_gid, 1)); + (void)fprintf(fp, "%s%2u %-12s %-12s ", f_mode, sbp->st_nlink, + name_uid(sbp->st_uid, 1), name_gid(sbp->st_gid, 1)); /* * print device id's for devices, or sizes for other nodes ==== //depot/projects/hammer/contrib/telnet/telnetd/sys_term.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif #include -__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/sys_term.c,v 1.22 2009/12/27 11:56:32 ed Exp $"); +__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/sys_term.c,v 1.23 2010/01/13 18:37:42 ed Exp $"); #include #include @@ -1303,24 +1303,7 @@ void cleanup(int sig __unused) { - char *p; - sigset_t mask; - p = line + sizeof(_PATH_DEV) - 1; - /* - * Block all signals before clearing the utmp entry. We don't want to - * be called again after calling logout() and then not add the wtmp - * entry because of not finding the corresponding entry in utmp. - */ - sigfillset(&mask); - sigprocmask(SIG_SETMASK, &mask, NULL); - if (logout(p)) - logwtmp(p, "", ""); - (void)chmod(line, 0666); - (void)chown(line, 0, 0); - *p = 'p'; - (void)chmod(line, 0666); - (void)chown(line, 0, 0); - (void) shutdown(net, 2); + (void) shutdown(net, SHUT_RDWR); _exit(1); } ==== //depot/projects/hammer/contrib/telnet/telnetd/telnetd.c#7 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif #include -__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/telnetd.c,v 1.30 2008/07/28 18:58:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/contrib/telnet/telnetd/telnetd.c,v 1.32 2010/01/13 18:46:50 ed Exp $"); #include "telnetd.h" #include "pathnames.h" @@ -47,7 +47,6 @@ #include #include #include -#include #include @@ -693,7 +692,6 @@ Please contact your net administrator"); remote_hostname[sizeof(remote_hostname) - 1] = '\0'; - trimdomain(remote_hostname, UT_HOSTSIZE); if (!isdigit(remote_hostname[0]) && strlen(remote_hostname) > utmp_len) err_ = getnameinfo(who, who->sa_len, remote_hostname, sizeof(remote_hostname), NULL, 0, ==== //depot/projects/hammer/crypto/openssh/config.h#18 (text+ko) ==== @@ -85,13 +85,13 @@ /* #undef CONF_UTMPX_FILE */ /* Define if you want to specify the path to your utmp file */ -#define CONF_UTMP_FILE "/var/run/utmp" +/* #undef CONF_UTMP_FILE */ /* Define if you want to specify the path to your wtmpx file */ /* #undef CONF_WTMPX_FILE */ /* Define if you want to specify the path to your wtmp file */ -#define CONF_WTMP_FILE "/var/log/wtmp" +/* #undef CONF_WTMP_FILE */ /* Define if your platform needs to skip post auth file descriptor passing */ /* #undef DISABLE_FD_PASSING */ @@ -112,13 +112,13 @@ /* #undef DISABLE_SHADOW */ /* Define if you don't want to use utmp */ -/* #undef DISABLE_UTMP */ +#define DISABLE_UTMP 1 /* Define if you don't want to use utmpx */ -#define DISABLE_UTMPX 1 +/* #undef DISABLE_UTMPX */ /* Define if you don't want to use wtmp */ -/* #undef DISABLE_WTMP */ +#define DISABLE_WTMP 1 /* Define if you don't want to use wtmpx */ #define DISABLE_WTMPX 1 @@ -319,7 +319,7 @@ /* #undef HAVE_ENDUTENT */ /* Define to 1 if you have the `endutxent' function. */ -/* #undef HAVE_ENDUTXENT */ +#define HAVE_ENDUTXENT 1 /* Define if your system has /etc/default/login */ /* #undef HAVE_ETC_DEFAULT_LOGIN */ @@ -445,13 +445,13 @@ /* #undef HAVE_GETUTLINE */ /* Define to 1 if you have the `getutxent' function. */ -/* #undef HAVE_GETUTXENT */ +#define HAVE_GETUTXENT 1 /* Define to 1 if you have the `getutxid' function. */ -/* #undef HAVE_GETUTXID */ +#define HAVE_GETUTXID 1 /* Define to 1 if you have the `getutxline' function. */ -/* #undef HAVE_GETUTXLINE */ +#define HAVE_GETUTXLINE 1 /* Define to 1 if you have the `get_default_context_with_level' function. */ /* #undef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL */ @@ -484,10 +484,10 @@ #define HAVE_HEADER_AD 1 /* Define if you have ut_host in utmp.h */ -#define HAVE_HOST_IN_UTMP 1 +/* #undef HAVE_HOST_IN_UTMP */ /* Define if you have ut_host in utmpx.h */ -/* #undef HAVE_HOST_IN_UTMPX */ +#define HAVE_HOST_IN_UTMPX 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_IAF_H */ @@ -499,7 +499,7 @@ /* #undef HAVE_ID_IN_UTMP */ /* Define if you have ut_id in utmpx.h */ -/* #undef HAVE_ID_IN_UTMPX */ +#define HAVE_ID_IN_UTMPX 1 /* Define to 1 if you have the `inet_aton' function. */ #define HAVE_INET_ATON 1 @@ -574,7 +574,7 @@ /* #undef HAVE_LINUX_IF_TUN_H */ /* Define if your libraries define login() */ -#define HAVE_LOGIN 1 +/* #undef HAVE_LOGIN */ /* Define to 1 if you have the header file. */ #define HAVE_LOGIN_CAP_H 1 @@ -586,10 +586,10 @@ /* #undef HAVE_LOGIN_H */ /* Define to 1 if you have the `logout' function. */ -#define HAVE_LOGOUT 1 +/* #undef HAVE_LOGOUT */ /* Define to 1 if you have the `logwtmp' function. */ -#define HAVE_LOGWTMP 1 +/* #undef HAVE_LOGWTMP */ /* Define to 1 if the system has the type `long double'. */ #define HAVE_LONG_DOUBLE 1 @@ -704,7 +704,7 @@ /* #undef HAVE_PUTUTLINE */ /* Define to 1 if you have the `pututxline' function. */ -/* #undef HAVE_PUTUTXLINE */ +#define HAVE_PUTUTXLINE 1 /* Define if your password has a pw_change field */ #define HAVE_PW_CHANGE_IN_PASSWD 1 @@ -800,7 +800,7 @@ /* #undef HAVE_SETUTENT */ /* Define to 1 if you have the `setutxent' function. */ -/* #undef HAVE_SETUTXENT */ +#define HAVE_SETUTXENT 1 /* Define to 1 if you have the `setvbuf' function. */ #define HAVE_SETVBUF 1 @@ -1025,7 +1025,7 @@ #define HAVE_TIME_H 1 /* Define if you have ut_time in utmp.h */ -#define HAVE_TIME_IN_UTMP 1 +/* #undef HAVE_TIME_IN_UTMP */ /* Define if you have ut_time in utmpx.h */ /* #undef HAVE_TIME_IN_UTMPX */ @@ -1043,13 +1043,13 @@ /* #undef HAVE_TV_IN_UTMP */ /* Define if you have ut_tv in utmpx.h */ -/* #undef HAVE_TV_IN_UTMPX */ +#define HAVE_TV_IN_UTMPX 1 /* Define if you have ut_type in utmp.h */ /* #undef HAVE_TYPE_IN_UTMP */ /* Define if you have ut_type in utmpx.h */ -/* #undef HAVE_TYPE_IN_UTMPX */ +#define HAVE_TYPE_IN_UTMPX 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_UCRED_H */ @@ -1091,10 +1091,10 @@ /* #undef HAVE_UTMPXNAME */ /* Define to 1 if you have the header file. */ -/* #undef HAVE_UTMPX_H */ +#define HAVE_UTMPX_H 1 /* Define to 1 if you have the header file. */ -#define HAVE_UTMP_H 1 +/* #undef HAVE_UTMP_H */ /* define if you have u_char data type */ #define HAVE_U_CHAR 1 ==== //depot/projects/hammer/crypto/openssh/defines.h#15 (text+ko) ==== @@ -674,7 +674,7 @@ #else /* Simply select your favourite login types. */ /* Can't do if-else because some systems use several... */ -# if defined(UTMPX_FILE) && !defined(DISABLE_UTMPX) +# if !defined(DISABLE_UTMPX) # define USE_UTMPX # endif # if defined(UTMP_FILE) && !defined(DISABLE_UTMP) ==== //depot/projects/hammer/crypto/openssh/loginrec.c#16 (text+ko) ==== @@ -207,6 +207,7 @@ int getlast_entry(struct logininfo *li); int lastlog_get_entry(struct logininfo *li); +int utmpx_get_entry(struct logininfo *li); int wtmp_get_entry(struct logininfo *li); int wtmpx_get_entry(struct logininfo *li); @@ -509,6 +510,10 @@ return(lastlog_get_entry(li)); #else /* !USE_LASTLOG */ +#if 1 + return (utmpx_get_entry(li)); +#endif + #if defined(DISABLE_LASTLOG) /* On some systems we shouldn't even try to obtain last login * time, e.g. AIX */ @@ -758,8 +763,8 @@ utx->ut_pid = li->pid; /* strncpy(): Don't necessarily want null termination */ - strncpy(utx->ut_name, li->username, - MIN_SIZEOF(utx->ut_name, li->username)); + strncpy(utx->ut_user, li->username, + MIN_SIZEOF(utx->ut_user, li->username)); if (li->type == LTYPE_LOGOUT) return; @@ -1608,6 +1613,31 @@ #endif /* HAVE_GETLASTLOGXBYNAME */ #endif /* USE_LASTLOG */ +#if 1 +int +utmpx_get_entry(struct logininfo *li) +{ + struct utmpx *utx; + + if (setutxdb(UTXDB_LASTLOGIN, NULL) != 0) + return (0); + utx = getutxuser(li->username); + if (utx == NULL) { + endutxent(); + return (0); + } + + line_fullname(li->line, utx->ut_line, + MIN_SIZEOF(li->line, utx->ut_line)); + strlcpy(li->hostname, utx->ut_host, + MIN_SIZEOF(li->hostname, utx->ut_host)); + li->tv_sec = utx->ut_tv.tv_sec; + li->tv_usec = utx->ut_tv.tv_usec; + endutxent(); + return (1); +} +#endif + #ifdef USE_BTMP /* * Logs failed login attempts in _PATH_BTMP if that exists. ==== //depot/projects/hammer/crypto/openssh/sshd.c#20 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include "includes.h" -__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.50 2009/11/25 15:12:24 attilio Exp $"); +__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.51 2010/01/13 18:43:32 ed Exp $"); #include #include @@ -73,7 +73,6 @@ #include #include #include -#include #include #include @@ -240,7 +239,7 @@ u_int session_id2_len = 0; /* record remote hostname or ip */ -u_int utmp_len = UT_HOSTSIZE; +u_int utmp_len = MAXHOSTNAMELEN; /* options.max_startup sized array of fd ints */ int *startup_pipes = NULL; ==== //depot/projects/hammer/etc/newsyslog.conf#13 (text+ko) ==== @@ -1,5 +1,5 @@ # configuration file for newsyslog -# $FreeBSD: src/etc/newsyslog.conf,v 1.52 2008/12/02 16:46:01 kensmith Exp $ +# $FreeBSD: src/etc/newsyslog.conf,v 1.53 2010/01/13 19:07:48 ed Exp $ # # Entries which do not specify the '/pid_file' field will cause the # syslogd process to be signalled when that log file is rotated. This @@ -33,6 +33,6 @@ /var/log/ppp.log root:network 640 3 100 * JC /var/log/security 600 10 100 * JC /var/log/sendmail.st 640 10 * 168 B +/var/log/utx.log 644 3 * @01T05 B /var/log/weekly.log 640 5 1 $W6D0 JN -/var/log/wtmp 644 3 * @01T05 B /var/log/xferlog 600 7 100 * JC ==== //depot/projects/hammer/etc/periodic/monthly/200.accounting#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/periodic/monthly/200.accounting,v 1.10 2002/09/24 18:53:46 ache Exp $ +# $FreeBSD: src/etc/periodic/monthly/200.accounting,v 1.11 2010/01/13 19:07:48 ed Exp $ # # If there is a global system configuration file, suck it in. @@ -15,7 +15,7 @@ umask 066 case "$monthly_accounting_enable" in [Yy][Ee][Ss]) - W=/var/log/wtmp + W=/var/log/utx.log rc=0 remove=NO if [ ! -f $W.0 ] ==== //depot/projects/hammer/etc/rc.d/cleanvar#13 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/cleanvar,v 1.13 2007/05/24 05:58:20 rse Exp $ +# $FreeBSD: src/etc/rc.d/cleanvar,v 1.14 2010/01/13 19:07:48 ed Exp $ # # PROVIDE: cleanvar @@ -58,8 +58,8 @@ { if [ -d /var/run -a ! -f /var/run/clean_var ]; then purgedir /var/run - # And an initial utmp file - (cd /var/run && cp /dev/null utmp && chmod 644 utmp) + # And an initial utmpx active session file + (cd /var/run && cp /dev/null utx.active && chmod 644 utx.active) >/var/run/clean_var fi if [ -d /var/spool/lock -a ! -f /var/spool/lock/clean_var ]; then ==== //depot/projects/hammer/etc/rc.d/var#10 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/var,v 1.44 2007/12/08 23:00:28 dougb Exp $ +# $FreeBSD: src/etc/rc.d/var,v 1.45 2010/01/13 19:07:48 ed Exp $ # # PROVIDE: var @@ -98,12 +98,12 @@ ;; esac -# Make sure we have /var/log/lastlog and /var/log/wtmp files -if [ ! -f /var/log/lastlog ]; then - cp /dev/null /var/log/lastlog - chmod 644 /var/log/lastlog +# Make sure we have /var/log/utx.lastlogin and /var/log/utx.log files +if [ ! -f /var/log/utx.lastlogin ]; then + cp /dev/null /var/log/utx.lastlogin + chmod 644 /var/log/utx.lastlogin fi -if [ ! -f /var/log/wtmp ]; then - cp /dev/null /var/log/wtmp - chmod 644 /var/log/wtmp +if [ ! -f /var/log/utx.log ]; then + cp /dev/null /var/log/utx.log + chmod 644 /var/log/utx.log fi ==== //depot/projects/hammer/games/fortune/datfiles/freebsd-tips#19 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.47 2009/01/12 19:17:43 simon Exp $ +$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.48 2010/01/11 21:17:49 gavin Exp $ % Any user that is a member of the wheel group can use "su -" to simulate a root login. You can add a user to the wheel group by editing /etc/group. @@ -50,18 +50,6 @@ be able to run it unless you first type "rehash". -- Dru % -If you are running xterm, the default TERM variable will be 'xterm'. If you -set this environment variable to 'xterm-color' instead, a lot of programs will -use colors. You can do this by - - TERM=xterm-color; export TERM - -in Bourne-derived shells, and - - setenv TERM xterm-color - -in csh-derived shells. -% If you do not want to get beeps in X11 (X Windows), you can turn them off with xset b off ==== //depot/projects/hammer/include/Makefile#84 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.293 2010/01/05 02:37:59 davidxu Exp $ +# $FreeBSD: src/include/Makefile,v 1.294 2010/01/13 17:29:55 ed Exp $ # # Doing a "make install" builds /usr/include. @@ -24,8 +24,8 @@ stdarg.h stdbool.h stddef.h stdio.h stdlib.h string.h stringlist.h \ strings.h sysexits.h tar.h termios.h tgmath.h \ time.h timeconv.h timers.h ttyent.h \ - ulimit.h unistd.h utime.h utmp.h uuid.h varargs.h vis.h wchar.h \ - wctype.h wordexp.h + ulimit.h unistd.h utime.h utmp.h utmpx.h uuid.h varargs.h vis.h \ + wchar.h wctype.h wordexp.h PHDRS= sched.h _semaphore.h ==== //depot/projects/hammer/include/utmp.h#3 (text+ko) ==== @@ -1,73 +1,2 @@ -/* - * Copyright (c) 1988, 1993 - * The Regents of the University of California. All rights reserved. - * (c) UNIX System Laboratories, Inc. - * All or some portions of this file are derived from material licensed - * to the University of California by American Telephone and Telegraph - * Co. or Unix System Laboratories, Inc. and are reproduced herein with - * the permission of UNIX System Laboratories, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)utmp.h 8.2 (Berkeley) 1/21/94 - * $FreeBSD: src/include/utmp.h,v 1.11 2008/11/16 14:43:33 ed Exp $ - */ - -#ifndef _UTMP_H_ -#define _UTMP_H_ - -#define _PATH_UTMP "/var/run/utmp" -#define _PATH_WTMP "/var/log/wtmp" -#define _PATH_LASTLOG "/var/log/lastlog" - -/* - * XXX: These values are too low, but cannot be changed without breaking - * the file format. Right now pts(4) is limited to 1000 instances, - * because /dev/pts/1000 would require UT_LINESIZE to be bigger. - * UT_HOSTSIZE is also too small to hold most common hostnames or IPv6 - * addresses. - */ -#define UT_NAMESIZE 16 /* see MAXLOGNAME in */ -#define UT_LINESIZE 8 -#define UT_HOSTSIZE 16 - -struct lastlog { - int32_t ll_time; - char ll_line[UT_LINESIZE]; - char ll_host[UT_HOSTSIZE]; -}; - -struct utmp { - char ut_line[UT_LINESIZE]; - char ut_name[UT_NAMESIZE]; - char ut_host[UT_HOSTSIZE]; - int32_t ut_time; -}; - -#endif /* !_UTMP_H_ */ +/* $FreeBSD: src/include/utmp.h,v 1.12 2010/01/13 19:03:48 ed Exp $ */ +#error " has been replaced by " ==== //depot/projects/hammer/lib/libc/gen/Makefile.inc#45 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.150 2010/01/05 02:37:59 davidxu Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.151 2010/01/13 17:29:55 ed Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -18,12 +18,12 @@ gethostname.c getloadavg.c getlogin.c getmntinfo.c getnetgrent.c \ getosreldate.c getpagesize.c getpagesizes.c \ getpeereid.c getprogname.c getpwent.c getttyent.c \ - getusershell.c getvfsbyname.c glob.c \ + getusershell.c getutxent.c getvfsbyname.c glob.c \ initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \ lockf.c lrand48.c mrand48.c nftw.c nice.c \ nlist.c nrand48.c opendir.c \ pause.c pmadvise.c popen.c posix_spawn.c \ - psignal.c pw_scan.c pwcache.c \ + psignal.c pututxline.c pw_scan.c pwcache.c \ raise.c readdir.c readpassphrase.c rewinddir.c \ scandir.c seed48.c seekdir.c sem.c sem_new.c semctl.c \ setdomainname.c sethostname.c setjmperr.c setmode.c \ @@ -32,7 +32,7 @@ sysconf.c sysctl.c sysctlbyname.c sysctlnametomib.c \ syslog.c telldir.c termios.c time.c times.c timezone.c tls.c \ ttyname.c ttyslot.c ualarm.c ulimit.c uname.c unvis.c \ - usleep.c utime.c valloc.c vis.c wait.c wait3.c waitpid.c \ + usleep.c utime.c utxdb.c valloc.c vis.c wait.c wait3.c waitpid.c \ wordexp.c SYM_MAPS+=${.CURDIR}/gen/Symbol.map @@ -54,7 +54,7 @@ getgrent.3 getgrouplist.3 gethostname.3 getloadavg.3 \ getmntinfo.3 getnetgrent.3 getosreldate.3 getpagesize.3 \ getpagesizes.3 getpass.3 getpeereid.3 getprogname.3 getpwent.3 \ - getttyent.3 getusershell.3 getvfsbyname.3 \ + getttyent.3 getusershell.3 getutxent.3 getvfsbyname.3 \ glob.3 initgroups.3 isgreater.3 ldexp.3 lockf.3 makecontext.3 \ modf.3 \ nice.3 nlist.3 pause.3 popen.3 \ @@ -126,6 +126,10 @@ getttyent.3 isdialuptty.3 getttyent.3 isnettty.3 \ >>> TRUNCATED FOR MAIL (1000 lines) <<<