PERFORCE change 76314 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sat Apr 30 22:30:34 PDT 2005
http://perforce.freebsd.org/chv.cgi?CH=76314
Change 76314 by marcel at marcel_nfs on 2005/05/01 05:29:48
IFC @76311
Affected files ...
.. //depot/projects/tty/Makefile.inc1#17 integrate
.. //depot/projects/tty/bin/ps/ps.1#8 integrate
.. //depot/projects/tty/contrib/bsnmp/snmpd/main.c#6 integrate
.. //depot/projects/tty/contrib/ipfilter/lib/printstate.c#2 integrate
.. //depot/projects/tty/contrib/ipfilter/tools/ippool.c#2 integrate
.. //depot/projects/tty/etc/Makefile#13 integrate
.. //depot/projects/tty/etc/pam.d/xdm#7 integrate
.. //depot/projects/tty/etc/rc#6 integrate
.. //depot/projects/tty/etc/rc.d/Makefile#10 integrate
.. //depot/projects/tty/etc/rc.d/initdiskless#8 delete
.. //depot/projects/tty/etc/rc.d/jail#8 integrate
.. //depot/projects/tty/etc/rc.d/preseedrandom#4 delete
.. //depot/projects/tty/etc/rc.d/rcconf.sh#3 integrate
.. //depot/projects/tty/etc/rc.initdiskless#2 integrate
.. //depot/projects/tty/lib/libc/net/getaddrinfo.3#8 integrate
.. //depot/projects/tty/lib/libc/net/gethostbydns.c#7 integrate
.. //depot/projects/tty/lib/libc/net/gethostbyht.c#4 integrate
.. //depot/projects/tty/lib/libc/net/gethostbyname.3#7 integrate
.. //depot/projects/tty/lib/libc/net/gethostbynis.c#4 integrate
.. //depot/projects/tty/lib/libc/net/gethostnamadr.c#5 integrate
.. //depot/projects/tty/lib/libc/net/getipnodebyname.3#5 integrate
.. //depot/projects/tty/lib/libc/net/getnameinfo.3#7 integrate
.. //depot/projects/tty/lib/libc/net/getnetbydns.c#3 integrate
.. //depot/projects/tty/lib/libc/net/getnetbyht.c#4 integrate
.. //depot/projects/tty/lib/libc/net/getnetbynis.c#2 integrate
.. //depot/projects/tty/lib/libc/net/getnetent.3#3 integrate
.. //depot/projects/tty/lib/libc/net/getnetnamadr.c#4 integrate
.. //depot/projects/tty/lib/libc/net/getprotoent.c#4 integrate
.. //depot/projects/tty/lib/libc/net/getservent.c#5 integrate
.. //depot/projects/tty/lib/libc/net/map_v4v6.c#2 integrate
.. //depot/projects/tty/lib/libc/net/name6.c#10 integrate
.. //depot/projects/tty/lib/libc/net/netdb_private.h#3 integrate
.. //depot/projects/tty/lib/libthr/Makefile#8 integrate
.. //depot/projects/tty/lib/libthr/arch/i386/i386/pthread_md.c#2 integrate
.. //depot/projects/tty/lib/libthr/arch/i386/include/pthread_md.h#2 integrate
.. //depot/projects/tty/lib/libthr/support/Makefile.inc#1 branch
.. //depot/projects/tty/lib/libthr/thread/thr_create.c#6 integrate
.. //depot/projects/tty/lib/msun/src/s_ceill.c#3 integrate
.. //depot/projects/tty/lib/msun/src/s_floorl.c#3 integrate
.. //depot/projects/tty/lib/msun/src/s_truncl.c#2 integrate
.. //depot/projects/tty/rescue/rescue/Makefile#9 integrate
.. //depot/projects/tty/sbin/fdisk/fdisk.c#7 integrate
.. //depot/projects/tty/sbin/geom/core/geom.c#5 integrate
.. //depot/projects/tty/sbin/ipf/ipf/Makefile#2 integrate
.. //depot/projects/tty/sbin/ipf/ipftest/Makefile#2 integrate
.. //depot/projects/tty/sbin/ipf/ipmon/Makefile#2 integrate
.. //depot/projects/tty/sbin/ipf/ipnat/Makefile#2 integrate
.. //depot/projects/tty/sbin/ipf/ippool/Makefile#2 integrate
.. //depot/projects/tty/sbin/ipf/ipresend/Makefile#2 integrate
.. //depot/projects/tty/sbin/ipf/ipsend/Makefile#2 integrate
.. //depot/projects/tty/sbin/ipf/libipf/Makefile#2 integrate
.. //depot/projects/tty/share/man/man4/ath.4#7 integrate
.. //depot/projects/tty/share/mk/sys.mk#10 integrate
.. //depot/projects/tty/sys/amd64/amd64/mp_machdep.c#6 integrate
.. //depot/projects/tty/sys/amd64/amd64/trap.c#10 integrate
.. //depot/projects/tty/sys/amd64/conf/NOTES#6 integrate
.. //depot/projects/tty/sys/amd64/include/smp.h#6 integrate
.. //depot/projects/tty/sys/conf/NOTES#19 integrate
.. //depot/projects/tty/sys/conf/files#22 integrate
.. //depot/projects/tty/sys/conf/files.amd64#15 integrate
.. //depot/projects/tty/sys/conf/files.i386#19 integrate
.. //depot/projects/tty/sys/conf/files.pc98#15 integrate
.. //depot/projects/tty/sys/conf/kern.post.mk#14 integrate
.. //depot/projects/tty/sys/conf/options#18 integrate
.. //depot/projects/tty/sys/conf/options.amd64#9 integrate
.. //depot/projects/tty/sys/conf/options.i386#13 integrate
.. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_compat.h#7 integrate
.. //depot/projects/tty/sys/contrib/ipfilter/netinet/ip_frag.c#6 integrate
.. //depot/projects/tty/sys/dev/arcmsr/arcmsr.c#2 integrate
.. //depot/projects/tty/sys/dev/asr/asr.c#10 integrate
.. //depot/projects/tty/sys/dev/ata/ata-all.c#17 integrate
.. //depot/projects/tty/sys/dev/ata/ata-all.h#14 integrate
.. //depot/projects/tty/sys/dev/ata/ata-card.c#13 integrate
.. //depot/projects/tty/sys/dev/ata/ata-cbus.c#9 integrate
.. //depot/projects/tty/sys/dev/ata/ata-chipset.c#15 integrate
.. //depot/projects/tty/sys/dev/ata/ata-disk.c#14 integrate
.. //depot/projects/tty/sys/dev/ata/ata-dma.c#11 integrate
.. //depot/projects/tty/sys/dev/ata/ata-isa.c#11 integrate
.. //depot/projects/tty/sys/dev/ata/ata-lowlevel.c#9 integrate
.. //depot/projects/tty/sys/dev/ata/ata-pci.c#13 integrate
.. //depot/projects/tty/sys/dev/ata/ata-pci.h#13 integrate
.. //depot/projects/tty/sys/dev/ata/ata-queue.c#7 integrate
.. //depot/projects/tty/sys/dev/ata/ata-raid.c#15 integrate
.. //depot/projects/tty/sys/dev/ata/ata-raid.h#9 integrate
.. //depot/projects/tty/sys/dev/ata/ata_if.m#2 integrate
.. //depot/projects/tty/sys/dev/ata/atapi-cam.c#11 integrate
.. //depot/projects/tty/sys/dev/ata/atapi-cd.c#13 integrate
.. //depot/projects/tty/sys/dev/ata/atapi-fd.c#11 integrate
.. //depot/projects/tty/sys/dev/ata/atapi-tape.c#11 integrate
.. //depot/projects/tty/sys/dev/ciss/ciss.c#14 integrate
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_amd.c#2 integrate
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_mod.c#2 integrate
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_piv.c#2 integrate
.. //depot/projects/tty/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate
.. //depot/projects/tty/sys/dev/pci/pci.c#12 integrate
.. //depot/projects/tty/sys/dev/pci/pci_pci.c#11 integrate
.. //depot/projects/tty/sys/dev/pci/pcireg.h#7 integrate
.. //depot/projects/tty/sys/dev/pci/pcivar.h#7 integrate
.. //depot/projects/tty/sys/dev/twa/tw_osl_cam.c#2 integrate
.. //depot/projects/tty/sys/fs/devfs/devfs_vfsops.c#9 integrate
.. //depot/projects/tty/sys/fs/pseudofs/pseudofs_vnops.c#10 integrate
.. //depot/projects/tty/sys/geom/vinum/geom_vinum_init.c#5 integrate
.. //depot/projects/tty/sys/i386/conf/NOTES#19 integrate
.. //depot/projects/tty/sys/i386/conf/PAE#8 integrate
.. //depot/projects/tty/sys/i386/i386/mp_machdep.c#15 integrate
.. //depot/projects/tty/sys/i386/i386/trap.c#14 integrate
.. //depot/projects/tty/sys/i386/include/pmc_mdep.h#2 integrate
.. //depot/projects/tty/sys/i386/include/smp.h#8 integrate
.. //depot/projects/tty/sys/kern/subr_kdb.c#3 integrate
.. //depot/projects/tty/sys/kern/subr_smp.c#11 integrate
.. //depot/projects/tty/sys/kern/vfs_aio.c#11 integrate
.. //depot/projects/tty/sys/kern/vfs_bio.c#15 integrate
.. //depot/projects/tty/sys/kern/vfs_cluster.c#13 integrate
.. //depot/projects/tty/sys/kern/vfs_subr.c#15 integrate
.. //depot/projects/tty/sys/libkern/crc32.c#5 integrate
.. //depot/projects/tty/sys/sys/pmc.h#2 integrate
.. //depot/projects/tty/sys/sys/ptrace.h#6 integrate
.. //depot/projects/tty/sys/sys/smp.h#7 integrate
.. //depot/projects/tty/sys/ufs/ffs/ffs_rawread.c#9 integrate
.. //depot/projects/tty/sys/vm/swap_pager.c#13 integrate
.. //depot/projects/tty/sys/vm/uma_core.c#13 integrate
.. //depot/projects/tty/sys/vm/uma_int.h#9 integrate
.. //depot/projects/tty/tools/regression/usr.bin/make/README#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/all.sh#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/archives/t0/Makefile#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/archives/t0/expected.status#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/archives/t0/expected.stderr#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/archives/t0/expected.stdout#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/archives/t0/libtest.a#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/archives/t0/test.t#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/archives/t1/Makefile#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/archives/t1/expected.status#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/archives/t1/expected.stderr#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/archives/t1/expected.stdout#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/archives/t1/libtest.a#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/archives/t1/test.t#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/archives/t2/Makefile#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/archives/t2/expected.status#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/archives/t2/expected.stderr#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/archives/t2/expected.stdout#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/archives/t2/libtest.a#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/archives/t2/test.t#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/basic/t0/expected.status#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/basic/t0/expected.stderr#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/basic/t0/expected.stdout#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/basic/t0/test.t#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/basic/t1/expected.status#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/basic/t1/expected.stderr#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/basic/t1/expected.stdout#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/basic/t1/test.t#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/basic/t2/expected.status#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/basic/t2/expected.stderr#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/basic/t2/expected.stdout#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/basic/t2/test.t#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/basic/t3/expected.status#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/basic/t3/expected.stderr#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/basic/t3/expected.stdout#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/basic/t3/test.t#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/common.sh#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t0/Makefile#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t0/TEST1.a#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t0/expected.status#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t0/expected.stderr#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t0/expected.stdout#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t0/test.t#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t1/Makefile#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t1/TEST1.a#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t1/TEST2.a#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t1/expected.status#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t1/expected.stderr#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t1/expected.stdout#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t1/test.t#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t2/Makefile#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t2/TEST1.a#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t2/TEST2.a#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t2/expected.status#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t2/expected.stderr#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t2/expected.stdout#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/suffixes/t2/test.t#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/variables/t0/expected.status#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/variables/t0/expected.stderr#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/variables/t0/expected.stdout#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/variables/t0/test.t#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/variables/t1/expected.status#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/variables/t1/expected.stderr#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/variables/t1/expected.stdout#1 branch
.. //depot/projects/tty/tools/regression/usr.bin/make/variables/t1/test.t#1 branch
.. //depot/projects/tty/tools/tools/tinderbox/etc/default.rc#4 integrate
.. //depot/projects/tty/tools/tools/tinderbox/tinderbox.pl#11 integrate
.. //depot/projects/tty/usr.bin/id/id.1#4 integrate
.. //depot/projects/tty/usr.bin/id/id.c#5 integrate
.. //depot/projects/tty/usr.bin/make/Makefile#5 integrate
.. //depot/projects/tty/usr.bin/make/cond.c#6 integrate
.. //depot/projects/tty/usr.bin/make/globals.h#2 integrate
.. //depot/projects/tty/usr.bin/make/hash_tables.c#1 branch
.. //depot/projects/tty/usr.bin/make/hash_tables.h#1 branch
.. //depot/projects/tty/usr.bin/make/main.c#9 integrate
.. //depot/projects/tty/usr.bin/make/make.h#5 integrate
.. //depot/projects/tty/usr.bin/make/nonints.h#6 integrate
.. //depot/projects/tty/usr.bin/make/parse.c#6 integrate
.. //depot/projects/tty/usr.bin/rs/rs.c#3 integrate
.. //depot/projects/tty/usr.sbin/adduser/adduser.sh#9 integrate
.. //depot/projects/tty/usr.sbin/jail/jail.8#11 integrate
.. //depot/projects/tty/usr.sbin/ppp/ppp.8.m4#10 integrate
Differences ...
==== //depot/projects/tty/Makefile.inc1#17 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.492 2005/04/06 01:55:43 peter Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.493 2005/04/30 16:09:23 imp Exp $
#
# Make command line options:
# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -337,6 +337,7 @@
@echo "--------------------------------------------------------------"
@echo ">>> stage 2.1: cleaning up the object tree"
@echo "--------------------------------------------------------------"
+ @rm -rf ${.OBJDIR}/sbin/ipf
${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR:S/^/par-/}
.endif
_obj:
==== //depot/projects/tty/bin/ps/ps.1#8 (text+ko) ====
@@ -27,7 +27,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ps.1 8.3 (Berkeley) 4/18/94
-.\" $FreeBSD: src/bin/ps/ps.1,v 1.85 2005/03/20 10:40:36 pjd Exp $
+.\" $FreeBSD: src/bin/ps/ps.1,v 1.86 2005/04/29 11:10:27 maxim Exp $
.\"
.Dd March 20, 2005
.Dt PS 1
@@ -103,7 +103,7 @@
.Bl -tag -width indent
.It Fl a
Display information about other users' processes as well as your own.
-This will skip any processes which do not have a controlling teminal,
+This will skip any processes which do not have a controlling terminal,
unless the
.Fl x
option is also specified.
==== //depot/projects/tty/contrib/bsnmp/snmpd/main.c#6 (text+ko) ====
@@ -1634,9 +1634,7 @@
timer_start(u_int ticks, void (*func)(void *), void *udata, struct lmodule *mod)
{
struct timer *tp;
-#ifdef USE_LIBBEGEMOT
- struct timeval due;
-#else
+#ifndef USE_LIBBEGEMOT
struct timespec due;
#endif
@@ -1644,15 +1642,8 @@
syslog(LOG_CRIT, "out of memory for timer");
exit(1);
}
-#ifdef USE_LIBBEGEMOT
- (void)gettimeofday(&due, NULL);
- due.tv_sec += ticks / 100;
- due.tv_usec += (ticks % 100) * 10000;
- if (due.tv_usec >= 1000000) {
- due.tv_sec++;
- due.tv_usec -= 1000000;
- }
-#else
+
+#ifndef USE_LIBBEGEMOT
due = evAddTime(evNowTime(),
evConsTime(ticks / 100, (ticks % 100) * 10000));
#endif
@@ -1664,8 +1655,7 @@
LIST_INSERT_HEAD(&timer_list, tp, link);
#ifdef USE_LIBBEGEMOT
- if ((tp->id = poll_start_timer(due.tv_sec * 1000 + due.tv_usec / 1000,
- 0, tfunc, tp)) < 0) {
+ if ((tp->id = poll_start_timer(ticks * 10, 0, tfunc, tp)) < 0) {
syslog(LOG_ERR, "cannot set timer: %m");
exit(1);
}
==== //depot/projects/tty/contrib/ipfilter/lib/printstate.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/ipfilter/lib/printstate.c,v 1.2 2005/04/25 18:20:12 darrenr Exp $ */
+/* $FreeBSD: src/contrib/ipfilter/lib/printstate.c,v 1.3 2005/04/28 21:36:30 darrenr Exp $ */
/*
* Copyright (C) 2002 by Darren Reed.
@@ -64,7 +64,7 @@
ips.is_icmp.ici_seq, ips.is_icmp.ici_type);
#ifdef USE_QUAD_T
- PRINTF("\tforward: pkts in %qd bytes in %qd pkts out %qd bytes out %qd\n\tbackward: pkts in %qd bytes in %qd pkts out %qd bytes out %qd\n",
+ PRINTF("\tforward: pkts in %lld bytes in %lld pkts out %lld bytes out %lld\n\tbackward: pkts in %lld bytes in %lld pkts out %lld bytes out %lld\n",
ips.is_pkts[0], ips.is_bytes[0],
ips.is_pkts[1], ips.is_bytes[1],
ips.is_pkts[2], ips.is_bytes[2],
==== //depot/projects/tty/contrib/ipfilter/tools/ippool.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/ipfilter/tools/ippool.c,v 1.2 2005/04/25 18:20:15 darrenr Exp $ */
+/* $FreeBSD: src/contrib/ipfilter/tools/ippool.c,v 1.3 2005/04/28 16:26:33 darrenr Exp $ */
/*
* Copyright (C) 2003 by Darren Reed.
@@ -639,7 +639,7 @@
}
}
- printf("%u object%s flushed\n", flush.iplf_count,
+ printf("%zd object%s flushed\n", flush.iplf_count,
(flush.iplf_count == 1) ? "" : "s");
return 0;
==== //depot/projects/tty/etc/Makefile#13 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.342 2005/04/17 10:47:57 glebius Exp $
+# $FreeBSD: src/etc/Makefile,v 1.343 2005/04/29 23:02:56 brooks Exp $
.if !defined(NO_SENDMAIL)
SUBDIR= sendmail
@@ -12,7 +12,8 @@
inetd.conf login.access login.conf \
mac.conf motd netconfig network.subr networks newsyslog.conf \
pf.conf pf.os phones profile protocols \
- rc rc.bsdextended rc.firewall rc.firewall6 rc.sendmail rc.shutdown \
+ rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \
+ rc.sendmail rc.shutdown \
rc.subr remote rpc services shells \
snmpd.config sysctl.conf syslog.conf usbd.conf \
etc.${MACHINE_ARCH}/ttys \
==== //depot/projects/tty/etc/pam.d/xdm#7 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/etc/pam.d/xdm,v 1.9 2004/02/20 21:59:51 des Exp $
+# $FreeBSD: src/etc/pam.d/xdm,v 1.10 2005/04/28 07:59:09 des Exp $
#
# PAM configuration for the "xdm" service
#
@@ -16,7 +16,7 @@
# session
#session required pam_ssh.so want_agent
-session required pam_permit.so
+session required pam_lastlog.so no_fail
# password
password required pam_deny.so
==== //depot/projects/tty/etc/rc#6 (text+ko) ====
@@ -25,7 +25,7 @@
# SUCH DAMAGE.
#
# @(#)rc 5.27 (Berkeley) 6/5/91
-# $FreeBSD: src/etc/rc,v 1.335 2004/10/08 14:23:49 mtm Exp $
+# $FreeBSD: src/etc/rc,v 1.336 2005/04/29 23:02:56 brooks Exp $
#
# System startup script run by init on autoboot
@@ -65,6 +65,11 @@
_boot="start"
fi
+dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null`
+if [ ${dlv:=0} -ne 0 -o -f /etc/diskless ]; then
+ sh /etc/rc.initdiskless
+fi
+
skip="-s nostart"
[ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && skip="$skip -s nojail"
files=`rcorder ${skip} /etc/rc.d/* 2>/dev/null`
==== //depot/projects/tty/etc/rc.d/Makefile#10 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.51 2005/04/17 10:47:58 glebius Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.52 2005/04/29 23:02:56 brooks Exp $
FILES= DAEMON LOGIN NETWORKING SERVERS \
abi accounting addswap adjkerntz amd \
@@ -13,7 +13,7 @@
gbde gbde_swap \
hostname \
ike \
- inetd initdiskless initrandom \
+ inetd initrandom \
ip6addrctl ip6fw ipfilter ipfs ipfw ipmon \
ipnat ipsec ipxrouted isdnd \
jail \
@@ -26,7 +26,7 @@
nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \
othermta \
pccard pcvt pf pflog \
- powerd power_profile ppp-user pppoed preseedrandom pwcheck \
+ powerd power_profile ppp-user pppoed pwcheck \
quota \
ramdisk ramdisk-own random rarpd rcconf.sh resolv root \
route6d routed routing rpcbind rtadvd rwho \
==== //depot/projects/tty/etc/rc.d/jail#8 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/jail,v 1.21 2005/01/16 03:12:03 obrien Exp $
+# $FreeBSD: src/etc/rc.d/jail,v 1.22 2005/04/30 00:16:00 csjp Exp $
#
# PROVIDE: jail
@@ -163,15 +163,18 @@
mount -a -F "${jail_fstab}"
fi
if checkyesno jail_devfs; then
- info "Mounting devfs on ${jail_devdir}"
- devfs_mount_jail "${jail_devdir}" ${jail_ruleset}
-
- # Transitional symlink for old binaries
- if [ ! -L "${jail_devdir}/log" ]; then
- __pwd="`pwd`"
- cd "${jail_devdir}"
- ln -sf ../var/run/log log
- cd "$__pwd"
+ # If devfs is already mounted here, skip it.
+ df -t devfs "${jail_devdir}" >/dev/null
+ if [ $? -ne 0 ]; then
+ info "Mounting devfs on ${jail_devdir}"
+ devfs_mount_jail "${jail_devdir}" ${jail_ruleset}
+ # Transitional symlink for old binaries
+ if [ ! -L "${jail_devdir}/log" ]; then
+ __pwd="`pwd`"
+ cd "${jail_devdir}"
+ ln -sf ../var/run/log log
+ cd "$__pwd"
+ fi
fi
# XXX - It seems symlinks don't work when there
==== //depot/projects/tty/etc/rc.d/rcconf.sh#3 (text+ko) ====
@@ -1,10 +1,9 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/rcconf.sh,v 1.3 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/rcconf.sh,v 1.4 2005/04/29 23:02:56 brooks Exp $
#
# PROVIDE: rcconf
-# REQUIRE: initdiskless
# BEFORE: disks initrandom
. /etc/rc.subr
==== //depot/projects/tty/etc/rc.initdiskless#2 (text+ko) ====
@@ -24,14 +24,8 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.initdiskless,v 1.41 2004/12/12 08:04:26 obrien Exp $
-#
-# PROVIDE: initdiskless
-# REQUIRE: preseedrandom
-# BEFORE: rcconf
-# KEYWORD: nojail
+# $FreeBSD: src/etc/rc.initdiskless,v 1.42 2005/04/29 23:02:56 brooks Exp $
-
# On entry to this script the entire system consists of a read-only root
# mounted via NFS. The kernel has run BOOTP and configured an interface
# (otherwise it would not have been able to mount the NFS root!)
@@ -125,7 +119,6 @@
# (end of documentation, now get to the real code)
dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null`
-[ ${dlv:=0} -eq 0 ] && [ ! -f /etc/diskless ] && exit 0
# chkerr:
#
==== //depot/projects/tty/lib/libc/net/getaddrinfo.3#8 (text+ko) ====
@@ -16,7 +16,7 @@
.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
.\" PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $FreeBSD: src/lib/libc/net/getaddrinfo.3,v 1.30 2005/02/09 18:03:13 ru Exp $
+.\" $FreeBSD: src/lib/libc/net/getaddrinfo.3,v 1.31 2005/04/29 14:37:51 ume Exp $
.\"
.Dd December 20, 2004
.Dt GETADDRINFO 3
@@ -430,7 +430,3 @@
draft specification and documented in
.Dv "RFC 3493" ,
.Dq Basic Socket Interface Extensions for IPv6 .
-.Sh BUGS
-The implementation of
-.Fn getaddrinfo
-is not thread-safe.
==== //depot/projects/tty/lib/libc/net/gethostbydns.c#7 (text+ko) ====
@@ -58,7 +58,7 @@
static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.50 2005/04/27 19:12:57 ume Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.54 2005/04/29 19:55:23 ume Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -84,19 +84,9 @@
#define SPRINTF(x) ((size_t)sprintf x)
-#define MAXALIASES 35
-#define MAXADDRS 35
-
static const char AskedForGot[] =
"gethostby*.gethostanswer: asked for \"%s\", got \"%s\"";
-static char *h_addr_ptrs[MAXADDRS + 1];
-
-static struct hostent host;
-static char *host_aliases[MAXALIASES];
-static char hostbuf[8*1024];
-static u_char host_addr[16]; /* IPv4 or IPv6 */
-
#ifdef RESOLVSORT
static void addrsort(char **, int);
#endif
@@ -141,7 +131,7 @@
cp += x; \
if (cp > eom) { \
h_errno = NO_RECOVERY; \
- return (NULL); \
+ return -1; \
} \
} while (0)
@@ -149,16 +139,13 @@
do { \
if ((ptr) + (count) > eom) { \
h_errno = NO_RECOVERY; \
- return (NULL); \
+ return -1; \
} \
} while (0)
-static struct hostent *
-gethostanswer(answer, anslen, qname, qtype)
- const querybuf *answer;
- int anslen;
- const char *qname;
- int qtype;
+static int
+gethostanswer(const querybuf *answer, int anslen, const char *qname, int qtype,
+ struct hostent *he, struct hostent_data *hed)
{
const HEADER *hp;
const u_char *cp;
@@ -173,7 +160,7 @@
int (*name_ok)(const char *);
tname = qname;
- host.h_name = NULL;
+ he->h_name = NULL;
eom = answer->buf + anslen;
switch (qtype) {
case T_A:
@@ -185,7 +172,7 @@
break;
default:
h_errno = NO_RECOVERY;
- return (NULL); /* XXX should be abort(); */
+ return -1; /* XXX should be abort(); */
}
/*
* find first satisfactory answer
@@ -193,18 +180,18 @@
hp = &answer->hdr;
ancount = ntohs(hp->ancount);
qdcount = ntohs(hp->qdcount);
- bp = hostbuf;
- ep = hostbuf + sizeof hostbuf;
+ bp = hed->hostbuf;
+ ep = hed->hostbuf + sizeof hed->hostbuf;
cp = answer->buf;
BOUNDED_INCR(HFIXEDSZ);
if (qdcount != 1) {
h_errno = NO_RECOVERY;
- return (NULL);
+ return -1;
}
n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
if ((n < 0) || !(*name_ok)(bp)) {
h_errno = NO_RECOVERY;
- return (NULL);
+ return -1;
}
BOUNDED_INCR(n + QFIXEDSZ);
if (qtype == T_A || qtype == T_AAAA) {
@@ -215,19 +202,19 @@
n = strlen(bp) + 1; /* for the \0 */
if (n >= MAXHOSTNAMELEN) {
h_errno = NO_RECOVERY;
- return (NULL);
+ return -1;
}
- host.h_name = bp;
+ he->h_name = bp;
bp += n;
/* The qname can be abbreviated, but h_name is now absolute. */
- qname = host.h_name;
+ qname = he->h_name;
}
- ap = host_aliases;
+ ap = hed->host_aliases;
*ap = NULL;
- host.h_aliases = host_aliases;
- hap = h_addr_ptrs;
+ he->h_aliases = hed->host_aliases;
+ hap = hed->h_addr_ptrs;
*hap = NULL;
- host.h_addr_list = h_addr_ptrs;
+ he->h_addr_list = hed->h_addr_ptrs;
haveanswer = 0;
had_error = 0;
_dns_ttl_ = -1;
@@ -256,7 +243,7 @@
continue; /* XXX - had_error++ ? */
}
if ((qtype == T_A || qtype == T_AAAA) && type == T_CNAME) {
- if (ap >= &host_aliases[MAXALIASES-1])
+ if (ap >= &hed->host_aliases[_MAXALIASES-1])
continue;
n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
if ((n < 0) || !(*name_ok)(tbuf)) {
@@ -266,7 +253,7 @@
cp += n;
if (cp != erdata) {
h_errno = NO_RECOVERY;
- return (NULL);
+ return -1;
}
/* Store alias. */
*ap++ = bp;
@@ -283,7 +270,7 @@
continue;
}
strcpy(bp, tbuf);
- host.h_name = bp;
+ he->h_name = bp;
bp += n;
continue;
}
@@ -296,7 +283,7 @@
cp += n;
if (cp != erdata) {
h_errno = NO_RECOVERY;
- return (NULL);
+ return -1;
}
/* Get canonical name. */
n = strlen(tbuf) + 1; /* for the \0 */
@@ -335,11 +322,11 @@
cp += n;
if (cp != erdata) {
h_errno = NO_RECOVERY;
- return (NULL);
+ return -1;
}
if (!haveanswer)
- host.h_name = bp;
- else if (ap < &host_aliases[MAXALIASES-1])
+ he->h_name = bp;
+ else if (ap < &hed->host_aliases[_MAXALIASES-1])
*ap++ = bp;
else
n = -1;
@@ -353,7 +340,7 @@
}
break;
#else
- host.h_name = bp;
+ he->h_name = bp;
if (_res.options & RES_USE_INET6) {
n = strlen(bp) + 1; /* for the \0 */
if (n >= MAXHOSTNAMELEN) {
@@ -361,27 +348,27 @@
break;
}
bp += n;
- _map_v4v6_hostent(&host, &bp, &ep);
+ _map_v4v6_hostent(he, &bp, ep);
}
h_errno = NETDB_SUCCESS;
- return (&host);
+ return 0;
#endif
case T_A:
case T_AAAA:
- if (strcasecmp(host.h_name, bp) != 0) {
+ if (strcasecmp(he->h_name, bp) != 0) {
syslog(LOG_NOTICE|LOG_AUTH,
- AskedForGot, host.h_name, bp);
+ AskedForGot, he->h_name, bp);
cp += n;
continue; /* XXX - had_error++ ? */
}
- if (n != host.h_length) {
+ if (n != he->h_length) {
cp += n;
continue;
}
if (!haveanswer) {
int nn;
- host.h_name = bp;
+ he->h_name = bp;
nn = strlen(bp) + 1; /* for the \0 */
bp += nn;
}
@@ -393,25 +380,25 @@
had_error++;
continue;
}
- if (hap >= &h_addr_ptrs[MAXADDRS-1]) {
+ if (hap >= &hed->h_addr_ptrs[_MAXADDRS-1]) {
if (!toobig++)
dprintf("Too many addresses (%d)\n",
- MAXADDRS);
+ _MAXADDRS);
cp += n;
continue;
}
- bcopy(cp, *hap++ = bp, n);
+ memcpy(*hap++ = bp, cp, n);
bp += n;
cp += n;
if (cp != erdata) {
h_errno = NO_RECOVERY;
- return (NULL);
+ return -1;
}
break;
default:
dprintf("Impossible condition (type=%d)\n", type);
h_errno = NO_RECOVERY;
- return (NULL);
+ return -1;
/* BIND has abort() here, too risky on bad data */
}
if (!had_error)
@@ -427,46 +414,52 @@
* address in that case, not some random one
*/
if (_res.nsort && haveanswer > 1 && qtype == T_A)
- addrsort(h_addr_ptrs, haveanswer);
+ addrsort(hed->h_addr_ptrs, haveanswer);
# endif /*RESOLVSORT*/
- if (!host.h_name) {
+ if (!he->h_name) {
n = strlen(qname) + 1; /* for the \0 */
if (n > ep - bp || n >= MAXHOSTNAMELEN)
goto no_recovery;
strcpy(bp, qname);
- host.h_name = bp;
+ he->h_name = bp;
bp += n;
}
if (_res.options & RES_USE_INET6)
- _map_v4v6_hostent(&host, &bp, &ep);
+ _map_v4v6_hostent(he, &bp, ep);
h_errno = NETDB_SUCCESS;
- return (&host);
+ return 0;
}
no_recovery:
h_errno = NO_RECOVERY;
- return (NULL);
+ return -1;
}
+/* XXX: for async DNS resolver in ypserv */
struct hostent *
-__dns_getanswer(answer, anslen, qname, qtype)
- const char *answer;
- int anslen;
- const char *qname;
- int qtype;
+__dns_getanswer(const char *answer, int anslen, const char *qname, int qtype)
{
- switch(qtype) {
+ struct hostdata *hd;
+ int error;
+
+ if ((hd = __hostdata_init()) == NULL) {
+ h_errno = NETDB_INTERNAL;
+ return NULL;
+ }
+ switch (qtype) {
case T_AAAA:
- host.h_addrtype = AF_INET6;
- host.h_length = IN6ADDRSZ;
+ hd->host.h_addrtype = AF_INET6;
+ hd->host.h_length = IN6ADDRSZ;
break;
case T_A:
default:
- host.h_addrtype = AF_INET;
- host.h_length = INADDRSZ;
+ hd->host.h_addrtype = AF_INET;
+ hd->host.h_length = INADDRSZ;
break;
}
- return(gethostanswer((const querybuf *)answer, anslen, qname, qtype));
+ error = gethostanswer((const querybuf *)answer, anslen, qname, qtype,
+ &hd->host, &hd->data);
+ return (error == 0) ? &hd->host : NULL;
}
int
@@ -474,12 +467,15 @@
{
const char *name;
int af;
+ struct hostent *he;
+ struct hostent_data *hed;
querybuf *buf;
- int n, size, type;
+ int n, size, type, error;
name = va_arg(ap, const char *);
af = va_arg(ap, int);
- *(struct hostent **)rval = NULL;
+ he = va_arg(ap, struct hostent *);
+ hed = va_arg(ap, struct hostent_data *);
switch (af) {
case AF_INET:
@@ -496,8 +492,8 @@
return NS_UNAVAIL;
}
- host.h_addrtype = af;
- host.h_length = size;
+ he->h_addrtype = af;
+ he->h_length = size;
if ((buf = malloc(sizeof(*buf))) == NULL) {
h_errno = NETDB_INTERNAL;
@@ -513,67 +509,39 @@
dprintf("static buffer is too small (%d)\n", n);
return (0);
}
- *(struct hostent **)rval = gethostanswer(buf, n, name, type);
+ error = gethostanswer(buf, n, name, type, he, hed);
free(buf);
- return (*(struct hostent **)rval != NULL) ? NS_SUCCESS : NS_NOTFOUND;
+ return (error == 0) ? NS_SUCCESS : NS_NOTFOUND;
}
int
_dns_gethostbyaddr(void *rval, void *cb_data, va_list ap)
{
- const char *addr; /* XXX should have been def'd as u_char! */
+ const u_char *uaddr;
int len, af;
- const u_char *uaddr;
- static const u_char mapped[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0xff,0xff };
- static const u_char tunnelled[] = { 0,0, 0,0, 0,0, 0,0, 0,0, 0,0 };
- int n, size;
+ struct hostent *he;
+ struct hostent_data *hed;
+ int n, error;
querybuf *buf;
- struct hostent *hp;
char qbuf[MAXDNAME+1], *qp;
#ifdef SUNSECURITY
- struct hostent *rhp;
+ struct hostdata rhd;
+ struct hostent *rhe;
char **haddr;
u_long old_options;
- char hname2[MAXDNAME+1];
+ char hname2[MAXDNAME+1], numaddr[46];
#endif /*SUNSECURITY*/
- addr = va_arg(ap, const char *);
- uaddr = (const u_char *)addr;
+ uaddr = va_arg(ap, const u_char *);
len = va_arg(ap, int);
af = va_arg(ap, int);
-
- *(struct hostent **)rval = NULL;
-
+ he = va_arg(ap, struct hostent *);
+ hed = va_arg(ap, struct hostent_data *);
+
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
h_errno = NETDB_INTERNAL;
return NS_UNAVAIL;
}
- if (af == AF_INET6 && len == IN6ADDRSZ &&
- (!bcmp(uaddr, mapped, sizeof mapped) ||
- !bcmp(uaddr, tunnelled, sizeof tunnelled))) {
- /* Unmap. */
- addr += sizeof mapped;
- uaddr += sizeof mapped;
- af = AF_INET;
- len = INADDRSZ;
- }
- switch (af) {
- case AF_INET:
- size = INADDRSZ;
- break;
- case AF_INET6:
- size = IN6ADDRSZ;
- break;
- default:
- errno = EAFNOSUPPORT;
- h_errno = NETDB_INTERNAL;
- return NS_UNAVAIL;
- }
- if (size != len) {
- errno = EINVAL;
- h_errno = NETDB_INTERNAL;
- return NS_UNAVAIL;
- }
switch (af) {
case AF_INET:
(void) sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa",
@@ -609,7 +577,7 @@
dprintf("static buffer is too small (%d)\n", n);
return NS_UNAVAIL;
}
- if (!(hp = gethostanswer(buf, n, qbuf, T_PTR))) {
+ if ((error = gethostanswer(buf, n, qbuf, T_PTR, he, hed)) != 0) {
free(buf);
return NS_NOTFOUND; /* h_errno was set by gethostanswer() */
}
@@ -620,45 +588,49 @@
* turn off search as the name should be absolute,
* 'localhost' should be matched by defnames
*/
- strncpy(hname2, hp->h_name, MAXDNAME);
+ strncpy(hname2, he->h_name, MAXDNAME);
hname2[MAXDNAME] = '\0';
old_options = _res.options;
_res.options &= ~RES_DNSRCH;
_res.options |= RES_DEFNAMES;
- if (!(rhp = gethostbyname(hname2))) {
+ memset(&rhd, 0, sizeof rhd);
+ if (!(rhe = gethostbyname_r(hname2, &rhd.host, &rhd.data))) {
+ if (inet_ntop(af, addr, numaddr, sizeof(numaddr)) == NULL)
+ strlcpy(numaddr, "UNKNOWN", sizeof(numaddr));
syslog(LOG_NOTICE|LOG_AUTH,
"gethostbyaddr: No A record for %s (verifying [%s])",
- hname2, inet_ntoa(*((struct in_addr *)addr)));
+ hname2, numaddr);
_res.options = old_options;
h_errno = HOST_NOT_FOUND;
return NS_NOTFOUND;
}
_res.options = old_options;
- for (haddr = rhp->h_addr_list; *haddr; haddr++)
+ for (haddr = rhe->h_addr_list; *haddr; haddr++)
if (!memcmp(*haddr, addr, INADDRSZ))
break;
if (!*haddr) {
+ if (inet_ntop(af, addr, numaddr, sizeof(numaddr)) == NULL)
+ strlcpy(numaddr, "UNKNOWN", sizeof(numaddr));
syslog(LOG_NOTICE|LOG_AUTH,
"gethostbyaddr: A record of %s != PTR record [%s]",
- hname2, inet_ntoa(*((struct in_addr *)addr)));
+ hname2, numaddr);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list