Date: Wed, 30 Apr 2003 14:50:54 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 30147 for review Message-ID: <200304302150.h3ULosXR086659@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=30147 Change 30147 by peter@peter_daintree on 2003/04/30 14:50:18 IFC @30146 Affected files ... .. //depot/projects/hammer/share/man/man5/make.conf.5#6 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#7 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#12 integrate .. //depot/projects/hammer/sys/isa/isa_common.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#6 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#23 integrate .. //depot/projects/hammer/sys/sys/proc.h#19 integrate Differences ... ==== //depot/projects/hammer/share/man/man5/make.conf.5#6 (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.70 2003/03/08 13:39:41 markm Exp $ +.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.71 2003/04/30 21:15:41 markm Exp $ .\" .Dd November 3, 2000 .Dt MAKE.CONF 5 @@ -418,7 +418,7 @@ port(s). .It Va ENABLE_SUID_K5SU .Pq Vt bool -Set this if you wish to use the k5su utility. +Set this if you wish to use the ksu utility. Otherwise, it will be installed without the set-user-ID bit set. .It Va ENABLE_SUID_NEWGRP ==== //depot/projects/hammer/share/man/man5/rc.conf.5#7 (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/rc.conf.5,v 1.183 2003/04/22 18:53:14 trhodes Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.184 2003/04/30 21:15:41 markm Exp $ .\" .Dd March 3, 2002 .Dt RC.CONF 5 @@ -1077,19 +1077,6 @@ is not enabled. This variable is experimental. It may be removed or changed in the near future. -.It Va kerberos_stash -.Pq Vt str -If -.Dq Li YES , -instruct the Kerberos servers to use the stashed master key instead of -prompting for it (only if -.Va kerberos_server_enable -is set to -.Dq Li YES , -and is used for both -.Xr kerberos 1 -and -.Xr kadmind 8 ) . .It Va kerberos5_server_enable .Pq Vt bool Set to @@ -1102,13 +1089,13 @@ .Va kerberos5_server_enable is set to .Dq Li YES -this is the path to Kerberos 5 authentication server. +this is the path to Kerberos 5 Authentication Server. .It Va kadmind5_server_enable .Pq Vt bool Set to .Dq Li YES to start -.Xr k5admind 8 , +.Xr kadmind 8 , the Kerberos 5 Administration Daemon; set to .Dq Li NO on a slave server. @@ -1119,6 +1106,22 @@ is set to .Dq Li YES this is the path to Kerberos 5 Administration Daemon. +.It Va kpasswdd_server_enable +.Pq Vt bool +Set to +.Dq Li YES +to start +.Xr kpasswdd 8 , +the Kerberos 5 Password-Changing Daemon; set to +.Dq Li NO +on a slave server. +.It Va kpasswdd_server +.Pq Vt str +If +.Va kpasswdd_server_enable +is set to +.Dq Li YES +this is the path to Kerberos 5 Password-Changing Daemon. .It Va rwhod_enable .Pq Vt bool If set to ==== //depot/projects/hammer/sys/dev/sio/sio.c#12 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sio/sio.c,v 1.396 2003/04/30 12:57:39 markm Exp $ + * $FreeBSD: src/sys/dev/sio/sio.c,v 1.397 2003/04/30 21:39:28 peter Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ ==== //depot/projects/hammer/sys/isa/isa_common.c#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/isa/isa_common.c,v 1.33 2003/04/15 04:19:49 mdodd Exp $ + * $FreeBSD: src/sys/isa/isa_common.c,v 1.34 2003/04/30 21:41:41 peter Exp $ */ /* * Modifications for Intel architecture by Garrett A. Wollman. ==== //depot/projects/hammer/sys/kern/kern_synch.c#13 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/kern/kern_synch.c,v 1.218 2003/04/23 18:46:51 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_synch.c,v 1.219 2003/04/30 21:45:03 peter Exp $ */ #include "opt_ddb.h" ==== //depot/projects/hammer/sys/kern/kern_thr.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_thr.c,v 1.6 2003/04/17 22:21:57 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_thr.c,v 1.7 2003/04/30 21:45:03 peter Exp $ * */ ==== //depot/projects/hammer/sys/kern/kern_thread.c#23 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/sys/kern/kern_thread.c,v 1.126 2003/04/30 01:18:29 davidxu Exp $ + * $FreeBSD: src/sys/kern/kern_thread.c,v 1.127 2003/04/30 21:45:03 peter Exp $ */ #include <sys/param.h> ==== //depot/projects/hammer/sys/sys/proc.h#19 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.323 2003/04/24 16:20:14 wes Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.324 2003/04/30 21:45:03 peter Exp $ */ #ifndef _SYS_PROC_H_
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304302150.h3ULosXR086659>