From owner-freebsd-stable Thu Jan 18 4:30:25 2001 Delivered-To: freebsd-stable@freebsd.org Received: from thehousleys.net (frenchknot.ne.mediaone.net [24.147.224.201]) by hub.freebsd.org (Postfix) with ESMTP id 2ADDC37B401; Thu, 18 Jan 2001 04:30:08 -0800 (PST) Received: from thehousleys.net (baby.int.thehousleys.net [192.168.0.24]) by thehousleys.net (8.11.1/8.11.1) with ESMTP id f0ICU0f54837; Thu, 18 Jan 2001 07:30:01 -0500 (EST) (envelope-from jim@thehousleys.net) Message-ID: <3A66E1C8.E07626A4@thehousleys.net> Date: Thu, 18 Jan 2001 07:30:00 -0500 From: James Housley X-Mailer: Mozilla 4.76 [en] (X11; U; Linux 2.2.12 i386) X-Accept-Language: en MIME-Version: 1.0 To: Brian Behlendorf Cc: Kris Kennaway , freebsd-stable@FreeBSD.ORG Subject: Re: sshd not working after upgrade to 4.2S from 4.1R HELP References: Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Brian Behlendorf wrote: > Hmm - I ran mergemaster after my last make world, and it didn't pick up > the differences between /etc/pam.conf and /usr/src/etc/pam.conf > either. The /etc/pam.conf I had hadn't been changed since my last full > install, though I'd done a make world/mergemaster 3 times since > then. Curious. > Try running mergemaster -s, this will force a full comparison of the files. By default mergemaster only compare the $FreeBSD$ strings at the top to speed up comparison. Jim -- /"\ ASCII Ribbon Campaign . \ / - NO HTML/RTF in e-mail . X - NO Word docs in e-mail . / \ ----------------------------------------------------------------- jeh@FreeBSD.org http://www.FreeBSD.org The Power to Serve jim@TheHousleys.Net http://www.TheHousleys.net --------------------------------------------------------------------- Do not meddle in the affairs of dragons, for you are crunchy and taste good with ketchup. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message