From owner-freebsd-current  Fri Jan  4 14:25:18 2002
Delivered-To: freebsd-current@freebsd.org
Received: from mail12.speakeasy.net (mail12.speakeasy.net [216.254.0.212])
	by hub.freebsd.org (Postfix) with ESMTP id D776B37B41C
	for <freebsd-current@freebsd.org>; Fri,  4 Jan 2002 14:25:07 -0800 (PST)
Received: (qmail 6108 invoked from network); 4 Jan 2002 22:25:07 -0000
Received: from unknown (HELO laptop.baldwin.cx) ([64.81.54.73]) (envelope-sender <jhb@FreeBSD.org>)
          by mail12.speakeasy.net (qmail-ldap-1.03) with SMTP
          for <mharnois@cpinternet.com>; 4 Jan 2002 22:25:07 -0000
Message-ID: <XFMail.020104142454.jhb@FreeBSD.org>
X-Mailer: XFMail 1.4.0 on FreeBSD
X-Priority: 3 (Normal)
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
In-Reply-To: <86y9jd6a1t.fsf@c1030098-a.wtrlo1.ia.home.com>
Date: Fri, 04 Jan 2002 14:24:54 -0800 (PST)
From: John Baldwin <jhb@FreeBSD.org>
To: (Michael D. Harnois) <mharnois@cpinternet.com>
Subject: RE: mergemaster and /etc/pam.d
Cc: freebsd-current@freebsd.org
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-current.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-current>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-current>
X-Loop: FreeBSD.ORG


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 Baldwin <jhb@FreeBSD.org>  <><  http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve!"  -  http://www.FreeBSD.org/

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message