PERFORCE change 147920 for review

[Ed Schouten]

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

Change 147920 by ed at ed_dull on 2008/08/20 12:38:05

	IFC my last TTY change I made to the kernel: the removal of lbolt.

Affected files ...

.. //depot/projects/mpsafetty/crypto/openssh/readconf.c#3 integrate
.. //depot/projects/mpsafetty/share/man/man4/Makefile#8 integrate
.. //depot/projects/mpsafetty/share/man/man4/acpi_asus.4#2 delete
.. //depot/projects/mpsafetty/sys/kern/kern_synch.c#5 integrate
.. //depot/projects/mpsafetty/sys/sys/kernel.h#4 integrate
.. //depot/projects/mpsafetty/usr.bin/w/pr_time.c#2 integrate

Differences ...

==== //depot/projects/mpsafetty/crypto/openssh/readconf.c#3 (text+ko) ====

@@ -13,11 +13,12 @@
  */
 
 #include "includes.h"
-__RCSID("$FreeBSD: src/crypto/openssh/readconf.c,v 1.29 2008/08/01 02:48:36 des Exp $");
+__RCSID("$FreeBSD: src/crypto/openssh/readconf.c,v 1.30 2008/08/20 10:40:07 des Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
+#include <sys/sysctl.h>
 
 #include <netinet/in.h>
 
@@ -245,7 +246,19 @@
 	Forward *fwd;
 #ifndef NO_IPPORT_RESERVED_CONCEPT
 	extern uid_t original_real_uid;
-	if (newfwd->listen_port < IPPORT_RESERVED && original_real_uid != 0)
+	int ipport_reserved;
+#ifdef __FreeBSD__
+	size_t len_ipport_reserved = sizeof(ipport_reserved);
+
+	if (sysctlbyname("net.inet.ip.portrange.reservedhigh",
+	    &ipport_reserved, &len_ipport_reserved, NULL, 0) != 0)
+		ipport_reserved = IPPORT_RESERVED;
+	else
+		ipport_reserved++;
+#else
+	ipport_reserved = IPPORT_RESERVED;
+#endif
+	if (newfwd->listen_port < ipport_reserved && original_real_uid != 0)
 		fatal("Privileged ports can only be forwarded by root.");
 #endif
 	if (options->num_local_forwards >= SSH_MAX_FORWARDS_PER_DIRECTION)

==== //depot/projects/mpsafetty/share/man/man4/Makefile#8 (text+ko) ====

@@ -1,9 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.426 2008/08/20 08:31:58 ed Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.427 2008/08/20 11:48:04 rpaulo Exp $
 
 MAN=	aac.4 \
 	acpi.4 \
-	${_acpi_asus.4} \
 	${_acpi_dock.4} \
 	acpi_thermal.4 \
 	acpi_video.4 \
@@ -551,7 +550,6 @@
 MLINKS+=xl.4 if_xl.4
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
-_acpi_asus.4=	acpi_asus.4
 _acpi_dock.4=	acpi_dock.4
 _amdsmb.4=	amdsmb.4
 _asmc.4=	asmc.4

==== //depot/projects/mpsafetty/sys/kern/kern_synch.c#5 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.313 2008/08/07 21:00:13 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_synch.c,v 1.314 2008/08/20 12:20:22 ed Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_sched.h"

==== //depot/projects/mpsafetty/sys/sys/kernel.h#4 (text+ko) ====

@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD: src/sys/sys/kernel.h,v 1.143 2008/07/21 15:05:25 pjd Exp $
+ * $FreeBSD: src/sys/sys/kernel.h,v 1.144 2008/08/20 12:20:22 ed Exp $
  */
 
 #ifndef _SYS_KERNEL_H_

==== //depot/projects/mpsafetty/usr.bin/w/pr_time.c#2 (text+ko) ====

@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD: src/usr.bin/w/pr_time.c,v 1.19 2002/06/07 01:41:54 jmallett Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/w/pr_time.c,v 1.20 2008/08/20 12:32:19 ache Exp $");
 
 #ifndef lint
 static const char sccsid[] = "@(#)pr_time.c	8.2 (Berkeley) 4/4/94";
@@ -44,6 +44,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <wchar.h>
 
 #include "extern.h"
 
@@ -82,7 +83,7 @@
 	}
 
 	(void)strftime(buf, sizeof(buf), fmt, &tp);
-	(void)printf("%-7.7s", buf);
+	(void)wprintf(L"%-7.7s", buf);
 }
 
 /*