From owner-freebsd-current Wed Feb 20 4:12:11 2002 Delivered-To: freebsd-current@freebsd.org Received: from rwcrmhc52.attbi.com (rwcrmhc52.attbi.com [216.148.227.88]) by hub.freebsd.org (Postfix) with ESMTP id 28BBF37B402; Wed, 20 Feb 2002 04:12:08 -0800 (PST) Received: from 12-234-22-238.client.attbi.com ([12.234.22.238]) by rwcrmhc52.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020220121207.FKQS1147.rwcrmhc52.attbi.com@12-234-22-238.client.attbi.com>; Wed, 20 Feb 2002 12:12:07 +0000 Received: from master.gorean.org (root@master.gorean.org [10.0.0.2]) by 12-234-22-238.client.attbi.com (8.11.6/8.11.6) with ESMTP id g1KCC6q24636; Wed, 20 Feb 2002 04:12:07 -0800 (PST) (envelope-from DougB@FreeBSD.org) Received: from localhost (doug@localhost) by master.gorean.org (8.11.6/8.11.6) with ESMTP id g1KCC5088625; Wed, 20 Feb 2002 04:12:05 -0800 (PST) (envelope-from DougB@FreeBSD.org) Date: Wed, 20 Feb 2002 04:12:05 -0800 (PST) From: Doug Barton X-X-Sender: doug@master.gorean.org To: John Baldwin Cc: mharnois@cpinternet.com, Subject: RE: mergemaster and /etc/pam.d In-Reply-To: Message-ID: <20020220041035.S87756-100000@master.gorean.org> 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 On Fri, 4 Jan 2002, John Baldwin wrote: > > On 04-Jan-02 Michael D. Harnois wrote: > > mergemaster does not pick up changes to the /etc/pam.d directory. Is > > this a feature? > > 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. Doug -- "We have known freedom's price. We have shown freedom's power. And in this great conflict, ... we will see freedom's victory." - George W. Bush, President of the United States State of the Union, January 28, 2002 Do YOU Yahoo!? To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message