From owner-cvs-all@FreeBSD.ORG Sun Sep 25 18:45:56 2005 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B9F3916A41F; Sun, 25 Sep 2005 18:45:56 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7319C43D53; Sun, 25 Sep 2005 18:45:56 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j8PIjuFQ010172; Sun, 25 Sep 2005 18:45:56 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8PIjuZR010171; Sun, 25 Sep 2005 18:45:56 GMT (envelope-from rwatson) Message-Id: <200509251845.j8PIjuZR010171@repoman.freebsd.org> From: Robert Watson Date: Sun, 25 Sep 2005 18:45:56 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/etc/defaults rc.conf src/etc/rc.d kerberos src/share/man/man5 rc.conf.5 X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Sep 2005 18:45:56 -0000 rwatson 2005-09-25 18:45:56 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) etc/defaults rc.conf etc/rc.d kerberos share/man/man5 rc.conf.5 Log: Merge rc.conf:1.260, kerberos:1.5, rc.conf.5:1.265 from HEAD to RELENG_6: Add a new rc.conf entry, kerberos5_server_flags, which allows the administrator to specify additional start-up flags to the Kerberos 5 Authentication Server. Approved by: re (scottl) Revision Changes Path 1.252.2.3 +1 -0 src/etc/defaults/rc.conf 1.4.2.1 +1 -1 src/etc/rc.d/kerberos 1.256.2.4 +5 -0 src/share/man/man5/rc.conf.5