From owner-cvs-all Sat Apr 20 23:37:47 2002 Delivered-To: cvs-all@freebsd.org Received: from rover.village.org (rover.bsdimp.com [204.144.255.66]) by hub.freebsd.org (Postfix) with ESMTP id B70F937B400; Sat, 20 Apr 2002 23:37:40 -0700 (PDT) Received: from harmony.village.org (harmony.village.org [10.0.0.6]) by rover.village.org (8.11.3/8.11.3) with ESMTP id g3L6bdH65757; Sun, 21 Apr 2002 00:37:39 -0600 (MDT) (envelope-from imp@village.org) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.11.6/8.11.6) with ESMTP id g3L6bcb11796; Sun, 21 Apr 2002 00:37:38 -0600 (MDT) (envelope-from imp@village.org) Date: Sun, 21 Apr 2002 00:37:22 -0600 (MDT) Message-Id: <20020421.003722.106897064.imp@village.org> To: dougb@FreeBSD.org, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src UPDATING From: "M. Warner Losh" In-Reply-To: <20020421.000550.21910374.imp@village.org> References: <200204210328.g3L3Sg534129@freefall.freebsd.org> <200204210343.g3L3hrDp009659@intruder.bmah.org> <20020421.000550.21910374.imp@village.org> X-Mailer: Mew version 2.1 on Emacs 21.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG In message: <20020421.000550.21910374.imp@village.org> "M. Warner Losh" writes: : The Security Team promised that we wouldn't make this change in : -stable, and I still think we should *NOT* MFC it. The "it is too : hard to keep things different" pain is smaller than the pain we're : going to cause ourselves when 4.6 comes out. I'm opposed to this : change and really want to see it backed out. I don't have the SO hat : any more, but if I did, I'd be wearing it for this message. For the "it is too hard to have diffs" problem, please consider the following changes so that rc.conf can be the same in -current and -stable. I use 'sysctl' rather than 'uname' because uname is in /usr which isn't necessarily available when rc.conf is evaled. It will even turn off inetd when the user upgrades to -current (but if the user mergemastered after said update, he'd get that anyway). Please consider this in place of the simple MFC that you made. This should make your life easier and address the support nightmare that actually changing this in -stable is likely going to produce. A similar change may be needed for sendmail as well. In my circle of friends, I've already had several people ping me on this issue. :-( Warner Index: rc.conf =================================================================== RCS file: /cache/ncvs/src/etc/defaults/rc.conf,v retrieving revision 1.146 diff -u -r1.146 rc.conf --- rc.conf 11 Apr 2002 08:48:52 -0000 1.146 +++ rc.conf 21 Apr 2002 06:20:39 -0000 @@ -118,7 +118,10 @@ syslogd_program="/usr/sbin/syslogd" # path to syslogd, if you want a different one. syslogd_flags="-s" # Flags to syslogd (if enabled). #syslogd_flags="-ss" # Syslogd flags to not bind an inet socket -inetd_enable="NO" # Run the network daemon dispatcher (YES/NO). +case `sysctl -n kern.osrelease` in +[56789].*)inetd_enable="NO";; # Run the network daemon dispatcher (YES/NO). +*)inetd_enable="YES";; # Run the network daemon dispatcher (YES/NO). +esac inetd_program="/usr/sbin/inetd" # path to inetd, if you want a different one. inetd_flags="-wW" # Optional flags to inetd # To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message