Date: Wed, 17 Jan 2001 18:32:32 -0800 From: Kris Kennaway <kris@FreeBSD.ORG> To: Brian Behlendorf <brian@collab.net> Cc: freebsd-stable@FreeBSD.ORG Subject: Re: sshd not working after upgrade to 4.2S from 4.1R HELP Message-ID: <20010117183232.B69328@citusc17.usc.edu> In-Reply-To: <Pine.BSF.4.21.0101171049410.12483-100000@localhost>; from brian@collab.net on Wed, Jan 17, 2001 at 10:51:12AM -0800 References: <20010117012737.A55253@citusc17.usc.edu> <Pine.BSF.4.21.0101171049410.12483-100000@localhost>
next in thread | previous in thread | raw e-mail | index | archive | help
--s2ZSL+KKDSLx8OML Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jan 17, 2001 at 10:51:12AM -0800, Brian Behlendorf wrote: > On Wed, 17 Jan 2001, Kris Kennaway wrote: > > On Tue, Jan 16, 2001 at 06:19:07PM -0800, faSty wrote: > > > Hi there, > > >=20 > > > It happened to my server same situation today and I got the tip from= someone > > > told me do copy /usr/src/etc/pam.conf to /etc > >=20 > > This should have happened as part of running mergemaster, which is an > > important part of the upgrade process you should follow with every > > source update and rebuild. Please see the handbook for full > > instructions on how to safely update your system. >=20 > 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. It only compares $FreeBSD$ revisions by default (there's an option to do a full diff), so if you have done a partial merge in mergemaster and only updated the $FreeBSD$ hunk, it won't prompt you again in future runs until the next time someone commits to the file. Other than that, I'm not sure what it could be. Kris --s2ZSL+KKDSLx8OML Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.4 (FreeBSD) Comment: For info see http://www.gnupg.org iD8DBQE6ZlXAWry0BWjoQKURAkNRAJwMNovy16a146LK8BsIaqbN7evXhgCfYFCh w9j15WM9dLhu0QToQbFed1Q= =rolP -----END PGP SIGNATURE----- --s2ZSL+KKDSLx8OML-- 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?20010117183232.B69328>