Date: Thu, 18 Jan 2001 07:30:00 -0500 From: James Housley <jim@thehousleys.net> To: Brian Behlendorf <brian@collab.net> Cc: Kris Kennaway <kris@FreeBSD.ORG>, freebsd-stable@FreeBSD.ORG Subject: Re: sshd not working after upgrade to 4.2S from 4.1R HELP Message-ID: <3A66E1C8.E07626A4@thehousleys.net> References: <Pine.BSF.4.21.0101171049410.12483-100000@localhost>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3A66E1C8.E07626A4>