PERFORCE change 42641 for review

Peter Wemm peter at FreeBSD.org
Mon Nov 17 00:05:21 PST 2003 

http://perforce.freebsd.org/chv.cgi?CH=42641

Change 42641 by peter at peter_overcee on 2003/11/17 00:04:35

	IFC @42640

Affected files ...

.. //depot/projects/hammer/lib/libdisk/write_ia64_disk.c#8 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#38 integrate
.. //depot/projects/hammer/sbin/nologin/Makefile#2 integrate
.. //depot/projects/hammer/sbin/nologin/nologin.8#3 integrate
.. //depot/projects/hammer/sbin/nologin/nologin.c#1 branch
.. //depot/projects/hammer/sbin/nologin/nologin.sh#2 delete
.. //depot/projects/hammer/sys/dev/sio/sio.c#23 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_output.c#14 integrate

Differences ...

==== //depot/projects/hammer/lib/libdisk/write_ia64_disk.c#8 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libdisk/write_ia64_disk.c,v 1.12 2003/11/04 03:49:01 marcel Exp $");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_ia64_disk.c,v 1.13 2003/11/17 05:47:42 marcel Exp $");
 
 #include <sys/types.h>
 #include <sys/disklabel.h>
@@ -98,7 +98,7 @@
 	0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
 };
 
-uint32_t
+static uint32_t
 crc32(const void *buf, size_t size)
 {
 	const uint8_t *p;

==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#38 (text+ko) ====

@@ -29,7 +29,7 @@
 
 <sect1 id="support">
   <sect1info>
-    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.199 2003/11/15 05:24:10 bmah Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.200 2003/11/17 05:45:21 bmah Exp $</pubdate>
   </sect1info>
 
   <title>Supported Devices</title>
@@ -56,7 +56,7 @@
 
   <sect2>
     <title>Disk Controllers</title>
-      <para arch="i386,alpha,sparc64,ia64,pc98">IDE/ATA controllers (&man.ata.4; driver)
+      <para arch="i386,alpha,sparc64,ia64,pc98,amd64">IDE/ATA controllers (&man.ata.4; driver)
         <itemizedlist>
 	   <listitem>
 	     <para>Acard ATP850 UDMA2, ATP860 UDMA4, ATP865 UDMA6</para>
@@ -146,7 +146,7 @@
     <para arch="i386">Adaptec AHA_174x series EISA SCSI controller in 
       enhanced mode (&man.ahb.4; driver)</para>
 
-    <para arch="i386,pc98,alpha,sparc64">Adaptec AIC-7770, AIC-7850,
+    <para arch="i386,pc98,alpha,sparc64,amd64">Adaptec AIC-7770, AIC-7850,
       AIC-7860, AIC-7870, AIC-7880, and AIC789x based SCSI host
       adapters (&man.ahc.4; driver)</para>
 
@@ -859,7 +859,7 @@
     <para arch="i386,pc98">Fujitsu MB86960A/MB86965A based Fast Ethernet NICs
     (&man.fe.4; driver)</para>
 
-    <para arch="i386,pc98,alpha,ia64,sparc64">Intel 82557-, 82258-, 82559-, 82550-
+    <para arch="i386,pc98,alpha,ia64,sparc64,amd64">Intel 82557-, 82258-, 82559-, 82550-
     or 82562-based Fast Ethernet NICs (&man.fxp.4; driver)
       <itemizedlist>
         <listitem>
@@ -944,7 +944,7 @@
     on the 3Com 3XP Typhoon/Sidewinder (3CR990) chipset (&man.txp.4; driver)
     </para>
 
-    <para arch="i386,pc98,ia64">Gigabit Ethernet NICs based on the Broadcom BCM570x
+    <para arch="i386,pc98,ia64,amd64">Gigabit Ethernet NICs based on the Broadcom BCM570x
     (&man.bge.4; driver)
     </para>
 
@@ -1272,7 +1272,7 @@
 
   <sect2>
     <title>Serial Interfaces</title>
-    <para arch="i386,alpha,ia64"><quote>PC standard</quote> 8250, 16450, and 16550-based serial ports (&man.sio.4; driver)</para>
+    <para arch="i386,alpha,ia64,amd64"><quote>PC standard</quote> 8250, 16450, and 16550-based serial ports (&man.sio.4; driver)</para>
 
     <para arch="sparc64">Serial ports based on the SAB82532 serial
       chip, console only (sab driver)</para>
@@ -2122,7 +2122,7 @@
     <para arch="i386">Genius and Mustek hand scanners</para>
     <para arch="i386">GPB and Transputer drivers</para>
 
-    <para arch="i386,alpha,ia64">VGA-compatible video cards
+    <para arch="i386,alpha,ia64,amd64">VGA-compatible video cards
       (&man.vga.4; driver)
 
       <note>
@@ -2139,7 +2139,7 @@
         <listitem arch="i386,alpha">
 	  <para>AT-style keyboards (&man.atkbd.4; driver)</para>
 	</listitem>
-        <listitem arch="i386,alpha,ia64">
+        <listitem arch="i386,alpha,ia64,amd64">
 	  <para>PS/2 keyboards (&man.atkbd.4; driver)</para>
 	</listitem>
         <listitem arch="pc98">
@@ -2157,7 +2157,7 @@
         <listitem arch="i386,pc98">
 	  <para>Bus mice and compatible devices (&man.mse.4; driver)</para>
 	</listitem>
-        <listitem arch="i386,alpha,ia64">
+        <listitem arch="i386,alpha,ia64,amd64">
 	  <para>PS/2 mice and compatible devices, including many laptop
 	    pointing devices (&man.psm.4; driver)</para>
 	</listitem>

==== //depot/projects/hammer/sbin/nologin/Makefile#2 (text+ko) ====

@@ -1,7 +1,14 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/22/94
-# $FreeBSD: src/sbin/nologin/Makefile,v 1.8 2001/04/07 11:21:20 ru Exp $
+# $FreeBSD: src/sbin/nologin/Makefile,v 1.9 2003/11/17 06:39:38 das Exp $
 
-SCRIPTS=nologin.sh
+PROG=	nologin
 MAN=	nologin.5 nologin.8
 
+# It is important that nologin be statically linked for security
+# reasons.  A dynamic non-setuid binary can be linked against a trojan
+# libc by setting LD_LIBRARY_PATH appropriately.  Both sshd(8) and
+# login(1) make it possible to log in with an unsanitized environment,
+# rendering a dynamic nologin binary virtually useless.
+NOSHARED=	YES
+
 .include <bsd.prog.mk>

==== //depot/projects/hammer/sbin/nologin/nologin.8#3 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nologin.8	8.1 (Berkeley) 6/19/93
-.\" $FreeBSD: src/sbin/nologin/nologin.8,v 1.11 2003/11/17 00:08:28 das Exp $
+.\" $FreeBSD: src/sbin/nologin/nologin.8,v 1.12 2003/11/17 06:39:54 das Exp $
 .\"
 .Dd June 19, 1993
 .Dt NOLOGIN 8
@@ -59,18 +59,3 @@
 .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/sys/dev/sio/sio.c#23 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.415 2003/11/16 23:05:52 bde Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.416 2003/11/17 07:21:19 bde Exp $");
 
 #include "opt_comconsole.h"
 #include "opt_compat.h"
@@ -1871,6 +1871,10 @@
 					CE_RECORD(com, CE_OVERRUN);
 			}
 cont:
+			if (line_status & LSR_TXRDY
+			    && com->state >= (CS_BUSY | CS_TTGO | CS_ODEVREADY))
+				goto txrdy;
+
 			/*
 			 * "& 0x7F" is to avoid the gcc-1.40 generating a slow
 			 * jump from the top of the loop to here
@@ -1908,6 +1912,7 @@
 			}
 		}
 
+txrdy:
 		/* output queued and everything ready? */
 		if (line_status & LSR_TXRDY
 		    && com->state >= (CS_BUSY | CS_TTGO | CS_ODEVREADY)) {

==== //depot/projects/hammer/sys/netinet6/ip6_output.c#14 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/netinet6/ip6_output.c,v 1.68 2003/11/08 23:36:32 sam Exp $	*/
+/*	$FreeBSD: src/sys/netinet6/ip6_output.c,v 1.69 2003/11/17 07:53:32 ume Exp $	*/
 /*	$KAME: ip6_output.c,v 1.279 2002/01/26 06:12:30 jinmei Exp $	*/
 
 /*
@@ -1371,7 +1371,7 @@
 		struct sockaddr_in6 *sa6_dst =
 		    (struct sockaddr_in6 *)&ro_pmtu->ro_dst;
 		if (ro_pmtu->ro_rt &&
-		    ((ro->ro_rt->rt_flags & RTF_UP) == 0 ||
+		    ((ro_pmtu->ro_rt->rt_flags & RTF_UP) == 0 ||
 		     !IN6_ARE_ADDR_EQUAL(&sa6_dst->sin6_addr, dst))) {
 			RTFREE(ro_pmtu->ro_rt);
 			ro_pmtu->ro_rt = (struct rtentry *)NULL;

More information about the p4-projects mailing list