From owner-freebsd-current Wed Feb 20 4:26:34 2002 Delivered-To: freebsd-current@freebsd.org Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31]) by hub.freebsd.org (Postfix) with ESMTP id E6A5137B404; Wed, 20 Feb 2002 04:26:31 -0800 (PST) Received: by flood.ping.uio.no (Postfix, from userid 2602) id F299F5341; Wed, 20 Feb 2002 13:26:26 +0100 (CET) X-URL: http://www.ofug.org/~des/ X-Disclaimer: The views expressed in this message do not necessarily coincide with those of any organisation or company with which I am or have been affiliated. To: Doug Barton Cc: John Baldwin , mharnois@cpinternet.com, Subject: Re: mergemaster and /etc/pam.d References: <20020220041035.S87756-100000@master.gorean.org> From: Dag-Erling Smorgrav Date: 20 Feb 2002 13:26:25 +0100 In-Reply-To: <20020220041035.S87756-100000@master.gorean.org> Message-ID: Lines: 14 User-Agent: Gnus/5.0808 (Gnus v5.8.8) Emacs/21.1 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Doug Barton writes: > On Fri, 4 Jan 2002, John Baldwin wrote: > > I don't think pam.d is installed right now by default. Once it is > > turned on by default I think mergemaster will DTRT. > John's right. By design, mm only knows about things installed by > /usr/src/etc/Makefile. That makes it flexible over time and much easier to > keep up to date. pam.d *is* listed in etc/Makefile, and mergemaster *does* pick up changes to it, as long as the RCS Id changed. DES -- Dag-Erling Smorgrav - des@ofug.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message